diff --git a/en/vpn/cca-client-config-mac.md b/en/cloudstack-compute-service/cloudstack-vpn-config-mac.md
similarity index 100%
rename from en/vpn/cca-client-config-mac.md
rename to en/cloudstack-compute-service/cloudstack-vpn-config-mac.md
diff --git a/en/vpn/cca-client-config-ubuntu.md b/en/cloudstack-compute-service/cloudstack-vpn-config-ubuntu.md
similarity index 100%
rename from en/vpn/cca-client-config-ubuntu.md
rename to en/cloudstack-compute-service/cloudstack-vpn-config-ubuntu.md
diff --git a/en/vpn/cca-client-config-windows.md b/en/cloudstack-compute-service/cloudstack-vpn-config-windows.md
similarity index 100%
rename from en/vpn/cca-client-config-windows.md
rename to en/cloudstack-compute-service/cloudstack-vpn-config-windows.md
diff --git a/en/vpn/cca-using-remote-access.md b/en/cloudstack-compute-service/cloudstack-vpn-using-remote-access.md
similarity index 100%
rename from en/vpn/cca-using-remote-access.md
rename to en/cloudstack-compute-service/cloudstack-vpn-using-remote-access.md
diff --git a/en/vpn/vpn.md b/en/vpn/vpn.md
deleted file mode 100644
index a36ccc3..0000000
--- a/en/vpn/vpn.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-name: VPN
----
diff --git a/es/vpn/cca-client-config-mac.md b/es/cloudstack-compute-service/cloudstack-vpn-config-mac.md
similarity index 100%
rename from es/vpn/cca-client-config-mac.md
rename to es/cloudstack-compute-service/cloudstack-vpn-config-mac.md
diff --git a/es/vpn/cca-client-config-ubuntu.md b/es/cloudstack-compute-service/cloudstack-vpn-config-ubuntu.md
similarity index 100%
rename from es/vpn/cca-client-config-ubuntu.md
rename to es/cloudstack-compute-service/cloudstack-vpn-config-ubuntu.md
diff --git a/es/vpn/cca-client-config-windows.md b/es/cloudstack-compute-service/cloudstack-vpn-config-windows.md
similarity index 100%
rename from es/vpn/cca-client-config-windows.md
rename to es/cloudstack-compute-service/cloudstack-vpn-config-windows.md
diff --git a/es/vpn/cca-using-remote-access.md b/es/cloudstack-compute-service/cloudstack-vpn-using-remote-access.md
similarity index 100%
rename from es/vpn/cca-using-remote-access.md
rename to es/cloudstack-compute-service/cloudstack-vpn-using-remote-access.md
diff --git a/es/vpn/vpn.md b/es/vpn/vpn.md
deleted file mode 100644
index a36ccc3..0000000
--- a/es/vpn/vpn.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-name: VPN
----
diff --git a/fr/cloudstack-compute-service/add-an-instance.md b/fr/cloudstack-compute-service/cloudstack-add-an-instance.md
similarity index 100%
rename from fr/cloudstack-compute-service/add-an-instance.md
rename to fr/cloudstack-compute-service/cloudstack-add-an-instance.md
diff --git a/fr/cloudstack-compute-service/instances.md b/fr/cloudstack-compute-service/cloudstack-instances.md
similarity index 100%
rename from fr/cloudstack-compute-service/instances.md
rename to fr/cloudstack-compute-service/cloudstack-instances.md
diff --git a/fr/vpn/cca-client-config-mac.md b/fr/cloudstack-compute-service/cloudstack-vpn-config-mac.md
similarity index 100%
rename from fr/vpn/cca-client-config-mac.md
rename to fr/cloudstack-compute-service/cloudstack-vpn-config-mac.md
diff --git a/fr/vpn/cca-client-config-ubuntu.md b/fr/cloudstack-compute-service/cloudstack-vpn-config-ubuntu.md
similarity index 100%
rename from fr/vpn/cca-client-config-ubuntu.md
rename to fr/cloudstack-compute-service/cloudstack-vpn-config-ubuntu.md
diff --git a/fr/vpn/cca-client-config-windows.md b/fr/cloudstack-compute-service/cloudstack-vpn-config-windows.md
similarity index 100%
rename from fr/vpn/cca-client-config-windows.md
rename to fr/cloudstack-compute-service/cloudstack-vpn-config-windows.md
diff --git a/fr/vpn/cca-using-remote-access.md b/fr/cloudstack-compute-service/cloudstack-vpn-using-remote-access.md
similarity index 100%
rename from fr/vpn/cca-using-remote-access.md
rename to fr/cloudstack-compute-service/cloudstack-vpn-using-remote-access.md
diff --git a/fr/vpn/vpn.md b/fr/vpn/vpn.md
deleted file mode 100644
index a36ccc3..0000000
--- a/fr/vpn/vpn.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-name: VPN
----
diff --git a/layout.yaml b/layout.yaml
index 79ff6f8..38a38cc 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -36,6 +36,10 @@ categories:
       - cloudstack-move-instance-to-different-vpc.md
       - cloudstack-force-reboot-an-instance.md
       - cloudstack-private_gateways.md
+      - cloudstack-vpn-using-remote-access.md
+      - cloudstack-vpn-config-mac.md
+      - cloudstack-vpn-config-windows.md
+      - cloudstack-vpn-config-ubuntu.md
 - category: gcp-compute-service
   icon: fa fa-cloud
   articles:
@@ -136,10 +140,3 @@ categories:
       - cloudmc_rest_api.md
       - deploy-virtual-machine-using-terraform.md
       - deploy-a-kubernetes-cluster-with-rancher-2-x.md
-- category: vpn
-  icon: fa fa-shield
-  articles:
-      - cca-using-remote-access.md
-      - cca-client-config-mac.md
-      - cca-client-config-windows.md
-      - cca-client-config-ubuntu.md