diff --git a/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java b/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java
index f5fee0c4a9..6f4b2dacf7 100644
--- a/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java
+++ b/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java
@@ -6,16 +6,16 @@ import org.json.JSONTokener;
 
 public class CDLDemo {
     public static void main(String[] args) {
-        System.out.println("7.1. Producing JSONArray Directly from Comma Delimited Text: ");
+        System.out.println("8.1. Producing JSONArray Directly from Comma Delimited Text: ");
         jsonArrayFromCDT();
         
-        System.out.println("\n7.2. Producing Comma Delimited Text from JSONArray: ");
+        System.out.println("\n8.2. Producing Comma Delimited Text from JSONArray: ");
         cDTfromJSONArray();
         
-        System.out.println("\n7.3.1. Producing JSONArray of JSONObjects Using Comma Delimited Text: ");
+        System.out.println("\n8.3.1. Producing JSONArray of JSONObjects Using Comma Delimited Text: ");
         jaOfJOFromCDT2();
         
-        System.out.println("\n7.3.2. Producing JSONArray of JSONObjects Using Comma Delimited Text: ");
+        System.out.println("\n8.3.2. Producing JSONArray of JSONObjects Using Comma Delimited Text: ");
         jaOfJOFromCDT2();
     }
     
diff --git a/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java b/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java
index bc39d13642..96a479541c 100644
--- a/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java
+++ b/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java
@@ -5,10 +5,10 @@ import org.json.JSONObject;
 
 public class CookieDemo {
     public static void main(String[] args) {
-        System.out.println("8.1. Converting a Cookie String into a JSONObject");
+        System.out.println("9.1. Converting a Cookie String into a JSONObject");
         cookieStringToJSONObject();
         
-        System.out.println("\n8.2. Converting a JSONObject into Cookie String");
+        System.out.println("\n9.2. Converting a JSONObject into Cookie String");
         jSONObjectToCookieString();
     }
     
diff --git a/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java b/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java
index 800018005c..5c6f684d63 100644
--- a/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java
+++ b/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java
@@ -5,10 +5,10 @@ import org.json.JSONObject;
 
 public class HTTPDemo {
     public static void main(String[] args) {
-        System.out.println("9.1. Converting JSONObject to HTTP Header: ");
+        System.out.println("10.1. Converting JSONObject to HTTP Header: ");
         jSONObjectToHTTPHeader();
         
-        System.out.println("\n9.2. Converting HTTP Header String Back to JSONObject: ");
+        System.out.println("\n10.2. Converting HTTP Header String Back to JSONObject: ");
         hTTPHeaderToJSONObject();
     }
     
diff --git a/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java b/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java
index 2a4fab2eab..a7341c8d9d 100644
--- a/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java
+++ b/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java
@@ -8,13 +8,13 @@ import org.json.JSONObject;
 
 public class JSONArrayDemo {
     public static void main(String[] args) {
-        System.out.println("5.1. Creating JSON Array: ");
+        System.out.println("6.1. Creating JSON Array: ");
         creatingJSONArray();
         
-        System.out.println("\n5.2. Creating JSON Array from JSON string: ");
+        System.out.println("\n6.2. Creating JSON Array from JSON string: ");
         jsonArrayFromJSONString();
         
-        System.out.println("\n5.3. Creating JSON Array from Collection Object: ");
+        System.out.println("\n6.3. Creating JSON Array from Collection Object: ");
         jsonArrayFromCollectionObj();
     }
     
diff --git a/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java b/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java
index cfe8467c30..8aa1d41afb 100644
--- a/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java
+++ b/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java
@@ -15,9 +15,6 @@ public class JSONObjectDemo {
         
         System.out.println("\n4.3. Creating JSONObject from JSON string: ");
         jsonFromJSONString();
-        
-        System.out.println("\n4.4. Creating JSONObject from Java Bean: ");
-        jsonFromDemoBean();
     }
     
     public static void jsonFromJSONObject() {
@@ -46,14 +43,4 @@ public class JSONObjectDemo {
         
         System.out.println(jo.toString());
     }
-    
-    public static void jsonFromDemoBean() {
-        DemoBean demo = new DemoBean();
-        demo.setId(1);
-        demo.setName("lorem ipsum");
-        demo.setActive(true);
-         
-        JSONObject jo = new JSONObject(demo);
-        System.out.println(jo);
-    }
 }
diff --git a/json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java b/json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java
new file mode 100644
index 0000000000..e9820c462a
--- /dev/null
+++ b/json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java
@@ -0,0 +1,21 @@
+package com.baeldung.jsonjava;
+
+import org.json.JSONObject;
+
+public class ObjectToFromJSON {
+
+	public static void main(String args[]) throws Exception {
+        System.out.println("\n5.1. Creating JSONObject from Java Bean: ");
+        jsonFromDemoBean();
+	}
+    
+    public static void jsonFromDemoBean() {
+        DemoBean demo = new DemoBean();
+        demo.setId(1);
+        demo.setName("lorem ipsum");
+        demo.setActive(true);
+         
+        JSONObject jo = new JSONObject(demo);
+        System.out.println(jo);
+    }
+}
diff --git a/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java b/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java
index 70f7921797..d8571bfcef 100644
--- a/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java
+++ b/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java
@@ -39,15 +39,4 @@ public class JSONObjectIntegrationTest {
         
         assertEquals("{\"city\":\"chicago\",\"name\":\"jon doe\",\"age\":\"22\"}", jo.toString());
     }
-
-    @Test
-    public void givenDemoBean_thenCreateJSONObject() {
-        DemoBean demo = new DemoBean();
-        demo.setId(1);
-        demo.setName("lorem ipsum");
-        demo.setActive(true);
-         
-        JSONObject jo = new JSONObject(demo);
-        assertEquals("{\"name\":\"lorem ipsum\",\"active\":true,\"id\":1}", jo.toString());
-    }
 }
diff --git a/json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java b/json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java
new file mode 100644
index 0000000000..99764c5dc9
--- /dev/null
+++ b/json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.jsonjava;
+
+import static org.junit.Assert.assertEquals;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+public class ObjectToFromJSONIntegrationTest {
+    @Test
+    public void givenDemoBean_thenCreateJSONObject() {
+        DemoBean demo = new DemoBean();
+        demo.setId(1);
+        demo.setName("lorem ipsum");
+        demo.setActive(true);
+         
+        JSONObject jo = new JSONObject(demo);
+        assertEquals("{\"name\":\"lorem ipsum\",\"active\":true,\"id\":1}", jo.toString());
+    }
+}