diff --git a/content/7/2025-04-09-enzonix-1.md b/content/7/enzonix/2025-04-09-enzonix-1.md
similarity index 99%
rename from content/7/2025-04-09-enzonix-1.md
rename to content/7/enzonix/2025-04-09-enzonix-1.md
index bd2160f..bfe8758 100644
--- a/content/7/2025-04-09-enzonix-1.md
+++ b/content/7/enzonix/2025-04-09-enzonix-1.md
@@ -23,12 +23,6 @@ asn="19318"
 asn_name="Interserver, Inc"
 country="US"
 city="New York"
-
-company="ENZONIX LLC"
-register_id="202109101521740"
-company_state="Indiana"
-company_country="US"
-website="enzonix.com"
 >}}
 
 {{< vps_info
diff --git a/content/7/enzonix/_index.md b/content/7/enzonix/_index.md
new file mode 100644
index 0000000..6e8101a
--- /dev/null
+++ b/content/7/enzonix/_index.md
@@ -0,0 +1,22 @@
++++
+title = "Enzonix"
++++
+
+{{< vps_company
+company="ENZONIX LLC"
+register_id="202109101521740"
+company_state="Indiana"
+company_country="US"
+website="enzonix.com"
+>}}
+
+{{< vps_policy
+torrent="yes (Legal only)"
+smtp="per request"
+adult_content="yes"
+vpn="yes (no high number of abuse complaints)"
+>}}
+'Terms' 'https://enzonix.com/legal.html'
+'SMTP' 'https://lowendtalk.com/discussion/comment/4387315/#Comment_4387315'
+'Adult_Content' 'https://lowendtalk.com/discussion/comment/4385527/#Comment_4385527'
+{{< /vps_policy>}}
diff --git a/content/7/2025-04-10-greencloudvps-1.md b/content/7/greencloudvps/2025-04-10-greencloudvps-1.md
similarity index 99%
rename from content/7/2025-04-10-greencloudvps-1.md
rename to content/7/greencloudvps/2025-04-10-greencloudvps-1.md
index 055d4df..e44e70e 100644
--- a/content/7/2025-04-10-greencloudvps-1.md
+++ b/content/7/greencloudvps/2025-04-10-greencloudvps-1.md
@@ -26,12 +26,6 @@ asn="202602"
 asn_name="Greencloud LLC"
 country="NL"
 city="Amsterdam"
-
-company="365 Group LLC / GREENCLOUD LLC"
-register_id="6645389 / 0109492303"
-company_state="Delaware"
-company_country="US / Hanoi, VN"
-website="greencloudvps.com"
 >}}
 
 {{< vps_info
diff --git a/content/7/2025-04-11-greencloudvps-2.md b/content/7/greencloudvps/2025-04-11-greencloudvps-2.md
similarity index 99%
rename from content/7/2025-04-11-greencloudvps-2.md
rename to content/7/greencloudvps/2025-04-11-greencloudvps-2.md
index 57eb327..2acca04 100644
--- a/content/7/2025-04-11-greencloudvps-2.md
+++ b/content/7/greencloudvps/2025-04-11-greencloudvps-2.md
@@ -26,12 +26,6 @@ asn="3214"
 asn_name="xTom GmbH"
 country="DE"
 city="Frankfurt"
-
-company="365 Group LLC / GREENCLOUD LLC"
-register_id="6645389 / 0109492303"
-company_state="Delaware"
-company_country="US / Hanoi, VN"
-website="greencloudvps.com"
 >}}
 
 {{< vps_info
diff --git a/content/7/greencloudvps/_index.md b/content/7/greencloudvps/_index.md
new file mode 100644
index 0000000..f909487
--- /dev/null
+++ b/content/7/greencloudvps/_index.md
@@ -0,0 +1,19 @@
++++
+title = "GreenCloudVPS"
++++
+
+{{< vps_company
+company="365 Group LLC / GREENCLOUD LLC"
+register_id="6645389 / 0109492303"
+company_state="Delaware"
+company_country="US / Hanoi, VN"
+website="greencloudvps.com"
+>}}
+
+{{< vps_policy
+torrent="yes (non-copyright-infringing material)"
+smtp="yes (no spam)"
+tor="no"
+>}}
+'TOS' 'https://greencloudvps.com/terms-of-service.php'
+{{< /vps_policy>}}
diff --git a/content/7/2025-04-09-hostiko-1.md b/content/7/hostiko/2025-04-09-hostiko-1.md
similarity index 99%
rename from content/7/2025-04-09-hostiko-1.md
rename to content/7/hostiko/2025-04-09-hostiko-1.md
index 13098c6..ddb3d9e 100644
--- a/content/7/2025-04-09-hostiko-1.md
+++ b/content/7/hostiko/2025-04-09-hostiko-1.md
@@ -26,12 +26,6 @@ asn="214379"
 asn_name="South Park Networks LLC"
 country="UA"
 city="Kiev"
-
-company="South Park Networks LLC"
-register_id="45267729"
-company_state="Kyiv"
-company_country="UA"
-website="hostiko.com.ua"
 >}}
 
 {{< vps_info
diff --git a/content/7/hostiko/_index.md b/content/7/hostiko/_index.md
new file mode 100644
index 0000000..b1209f1
--- /dev/null
+++ b/content/7/hostiko/_index.md
@@ -0,0 +1,21 @@
++++
+title = "Hostiko"
++++
+
+{{< vps_company
+company="South Park Networks LLC"
+register_id="45267729"
+company_state="Kyiv"
+company_country="UA"
+website="hostiko.com.ua"
+>}}
+
+{{< vps_policy
+torrent="yes"
+smtp="yes (no spam)"
+adult_content="no"
+tor="yes (no exit)"
+>}}
+'terms' 'https://hostiko.com.ua/en/terms'
+'tor' 'https://lowendspirit.com/discussion/comment/211102/#Comment_211102'
+{{< /vps_policy>}}
diff --git a/content/7/2025-04-10-kuroit-1.md b/content/7/kuroit/2025-04-10-kuroit-1.md
similarity index 98%
rename from content/7/2025-04-10-kuroit-1.md
rename to content/7/kuroit/2025-04-10-kuroit-1.md
index d01ef8e..b421e7d 100644
--- a/content/7/2025-04-10-kuroit-1.md
+++ b/content/7/kuroit/2025-04-10-kuroit-1.md
@@ -26,12 +26,6 @@ asn="136557"
 asn_name="Host Universal Pty Ltd"
 country="SG"
 city="Singapore"
-
-company="Kuroit(invoice) Puneet Kalra / KUROIT LIMITED"
-register_id="ORG-KA58-AP(<a target=_blank href=https://wq.apnic.net/apnic-bin/whois.pl?searchtext=ORG-KA58-AP&form_type=advanced>APNIC</a>) / 12230479"
-company_state="Jalandhar, Punjab"
-company_country="IN / London, UK"
-website="kuroit.com"
 >}}
 
 {{< vps_info
diff --git a/content/7/kuroit/_index.md b/content/7/kuroit/_index.md
new file mode 100644
index 0000000..9e9f165
--- /dev/null
+++ b/content/7/kuroit/_index.md
@@ -0,0 +1,19 @@
++++
+title = "Kuroit"
++++
+
+{{< vps_company
+company="Kuroit(invoice) Puneet Kalra / KUROIT LIMITED"
+register_id="ORG-KA58-AP(<a target=_blank href=https://wq.apnic.net/apnic-bin/whois.pl?searchtext=ORG-KA58-AP&form_type=advanced>APNIC</a>) / 12230479"
+company_state="Jalandhar, Punjab"
+company_country="IN / London, UK"
+website="kuroit.com"
+>}}
+
+{{< vps_policy
+smtp="yes (prohibit Mass mail)"
+adult_content="yes (Legal only)"
+tor="yes (no exit)"
+>}}
+'AUP' 'https://www.kuroit.com/acceptable-use-policy/'
+{{< /vps_policy>}}
diff --git a/content/7/2025-04-10-racknerd-1.md b/content/7/racknerd/2025-04-10-racknerd-1.md
similarity index 99%
rename from content/7/2025-04-10-racknerd-1.md
rename to content/7/racknerd/2025-04-10-racknerd-1.md
index c07b288..eb2d756 100644
--- a/content/7/2025-04-10-racknerd-1.md
+++ b/content/7/racknerd/2025-04-10-racknerd-1.md
@@ -24,12 +24,6 @@ asn="36352"
 asn_name="HostPapa"
 country="US"
 city="Seattle, WA"
-
-company="RACKNERD LLC"
-register_id="202250614731 / 7754911"
-company_state="California / Delaware"
-company_country="US"
-website="racknerd.com"
 >}}
 
 {{< vps_info
diff --git a/content/7/racknerd/_index.md b/content/7/racknerd/_index.md
new file mode 100644
index 0000000..d320544
--- /dev/null
+++ b/content/7/racknerd/_index.md
@@ -0,0 +1,17 @@
++++
+title = "Racknerd"
++++
+
+{{< vps_company
+company="RACKNERD LLC"
+register_id="202250614731 / 7754911"
+company_state="California / Delaware"
+company_country="US"
+website="racknerd.com"
+>}}
+
+{{< vps_policy
+smtp="yes (no spam)"
+>}}
+'TOS' 'https://racknerd.com/terms-of-service'
+{{< /vps_policy>}}
diff --git a/content/7/2025-04-09-shockhosting-1.md b/content/7/shockhosting/2025-04-09-shockhosting-1.md
similarity index 99%
rename from content/7/2025-04-09-shockhosting-1.md
rename to content/7/shockhosting/2025-04-09-shockhosting-1.md
index 6dc44ca..c496046 100644
--- a/content/7/2025-04-09-shockhosting-1.md
+++ b/content/7/shockhosting/2025-04-09-shockhosting-1.md
@@ -24,12 +24,6 @@ asn="395092"
 asn_name="Shock Hosting LLC"
 country="SG"
 city="Singapore"
-
-company="Shock Hosting LLC"
-register_id="5997884"
-company_state="Delaware"
-company_country="US"
-website="shockhosting.com"
 >}}
 
 {{< vps_info
diff --git a/content/7/shockhosting/_index.md b/content/7/shockhosting/_index.md
new file mode 100644
index 0000000..05a6775
--- /dev/null
+++ b/content/7/shockhosting/_index.md
@@ -0,0 +1,18 @@
++++
+title = "Shockhosting"
++++
+
+{{< vps_company
+company="Shock Hosting LLC"
+register_id="5997884"
+company_state="Delaware"
+company_country="US"
+website="shockhosting.com"
+>}}
+
+{{< vps_policy
+smtp="yes (no spam)"
+tor="yes (no exit)"
+>}}
+'AUP' 'https://shockhosting.com/aup'
+{{< /vps_policy>}}
diff --git a/content/7/2025-04-11-webhorizon-1.md b/content/7/webhorizon/2025-04-11-webhorizon-1.md
similarity index 98%
rename from content/7/2025-04-11-webhorizon-1.md
rename to content/7/webhorizon/2025-04-11-webhorizon-1.md
index d0b4ca7..de235a7 100644
--- a/content/7/2025-04-11-webhorizon-1.md
+++ b/content/7/webhorizon/2025-04-11-webhorizon-1.md
@@ -26,12 +26,6 @@ asn="149020"
 asn_name="WebHorizon Internet Services"
 country="SG"
 city="Singapore"
-
-company="WebHorizon IT Broadband Limited / WebHorizon Internet Services"
-register_id="14514455 / ORG-WIS5-AP(<a target=_blank href=https://wq.apnic.net/apnic-bin/whois.pl?searchtext=ORG-WIS5-AP&form_type=advanced>APNIC</a>)"
-company_state="London"
-company_country="UK / Maharashtra, IN"
-website="webhorizon.net"
 >}}
 
 {{< vps_info
diff --git a/content/7/webhorizon/_index.md b/content/7/webhorizon/_index.md
new file mode 100644
index 0000000..5861e2a
--- /dev/null
+++ b/content/7/webhorizon/_index.md
@@ -0,0 +1,21 @@
++++
+title = "Webhorizon"
++++
+
+{{< vps_company
+company="WebHorizon IT Broadband Limited / WebHorizon Internet Services"
+register_id="14514455 / ORG-WIS5-AP(<a target=_blank href=https://wq.apnic.net/apnic-bin/whois.pl?searchtext=ORG-WIS5-AP&form_type=advanced>APNIC</a>)"
+company_state="London"
+company_country="UK / Maharashtra, IN"
+website="webhorizon.net"
+>}}
+
+{{< vps_policy
+torrent="yes (legal only 20Mbps)"
+smtp="yes (no spam)"
+tor="yes (no exit)"
+vpn="yes"
+adult_content="no"
+>}}
+'AUP' 'https://webhorizon.net/aup.html'
+{{< /vps_policy>}}
diff --git a/layouts/shortcodes/vps_company.html b/layouts/shortcodes/vps_company.html
new file mode 100644
index 0000000..6f396d5
--- /dev/null
+++ b/layouts/shortcodes/vps_company.html
@@ -0,0 +1,22 @@
+{{- /*
+    For use with 7
+    */}}
+
+{{- /* Get OWNER Arguments. */}}
+{{- $COMPANY := or (.Get "company") "N/a" }}
+{{- $REGISTER_ID := or (.Get "register_id") "N/a" }}
+{{- $COMPANY_STATE := or (.Get "company_state") "N/a" }}
+{{- $COMPANY_COUNTRY := or (.Get "company_country") "N/a" }}
+{{- $WEBSITE := or (.Get "website") "N/a" }}
+
+{{ $owner := slice
+    (dict "type" "Company" "value" $COMPANY)
+    (dict "type" "Entity ID" "value" $REGISTER_ID)
+    (dict "type" "Company Location" "value" (print $COMPANY_STATE ", " $COMPANY_COUNTRY))
+    (dict "type" "Website" "value" (safeHTML (print "<a  target=_blank href='https://" $WEBSITE "'>" $WEBSITE "</a>")))
+}}
+
+<h2>Owner</h2>
+{{ range $owner }}
+    <b>{{ .type }}:</b> <pre>{{ .value |safeHTML }}</pre>
+{{ end }}
diff --git a/layouts/shortcodes/vps_location.html b/layouts/shortcodes/vps_location.html
index fcc77c3..dc4c347 100644
--- a/layouts/shortcodes/vps_location.html
+++ b/layouts/shortcodes/vps_location.html
@@ -8,34 +8,13 @@
 {{- $COUNTRY := or (.Get "country") "N/a" }}
 {{- $CITY := or (.Get "city") "N/a" }}
 
-{{- /* Get OWNER Arguments. */}}
-{{- $COMPANY := or (.Get "company") "N/a" }}
-{{- $REGISTER_ID := or (.Get "register_id") "N/a" }}
-{{- $COMPANY_STATE := or (.Get "company_state") "N/a" }}
-{{- $COMPANY_COUNTRY := or (.Get "company_country") "N/a" }}
-{{- $WEBSITE := or (.Get "website") "N/a" }}
-
-{{- /* Get UPSTREAM Arguments. */}}
-{{- $UPSTREAM := or (.Get "upstream") "N/a" }}
 
 {{ $location := slice
     (dict "type" "ASN" "value" (safeHTML (print "<a  target=_blank href='https://bgp.tools/as/" $ASN "'>AS" $ASN "</a> " $ASN_NAME)))
     (dict "type" "Country" "value" (print $CITY ", " $COUNTRY))
 }}
 
-{{ $owner := slice
-    (dict "type" "Company" "value" $COMPANY)
-    (dict "type" "Entity ID" "value" $REGISTER_ID)
-    (dict "type" "Company Location" "value" (print $COMPANY_STATE ", " $COMPANY_COUNTRY))
-    (dict "type" "Website" "value" (safeHTML (print "<a  target=_blank href='https://" $WEBSITE "'>" $WEBSITE "</a>")))
-}}
-
 <h3>Location</h3>
 {{ range $location }}
     <pre> <b>{{ .type }}:</b> {{ .value | safeHTML }}</pre>
-{{ end }}
-
-<h3>Owner</h3>
-{{ range $owner }}
-    <pre> <b>{{ .type }}:</b> {{ .value |safeHTML }}</pre>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/shortcodes/vps_policy.html b/layouts/shortcodes/vps_policy.html
new file mode 100644
index 0000000..986ddd9
--- /dev/null
+++ b/layouts/shortcodes/vps_policy.html
@@ -0,0 +1,46 @@
+{{- /*
+    For use with 7
+    */}}
+
+{{- /* Get Policy Arguments. */}}
+{{- $TORRENT := or (.Get "torrent") "N/a" }}
+{{- $SMTP := or (.Get "smtp") "N/a" }}
+{{- $ADULT_CONTENT := or (.Get "adult_content") "N/a" }}
+{{- $TOR := or (.Get "tor") "N/a" }}
+{{- $VPN := or (.Get "vpn") "N/a" }}
+
+{{- $policy := slice
+    (dict "type" "Torrent" "value" $TORRENT)
+    (dict "type" "SMTP(Port 25)" "value" $SMTP)
+    (dict "type" "Adult Content" "value" $ADULT_CONTENT)
+    (dict "type" "Tor Network" "value" $TOR)
+    (dict "type" "VPN" "value" $VPN)
+}}
+
+<h2>Policy</h2>
+<details class="spoiler">
+    <summary>Expand</summary>
+    <div class="spoiler-content">
+    {{- range $policy }}
+        <pre><b>{{ .type }}:</b> {{ .value | safeHTML }}</pre>
+    {{- end }}
+    </div>
+</details>
+
+<h3>Source</h3>
+<details class="spoiler">
+    <summary>Expand</summary>
+    <div class="spoiler-content">
+            {{ range (split (string .Inner) "\n") }}
+                {{ $line := trim . " \t\r\n" }}
+                {{ if ne $line "" }}
+                    {{ $line := replace $line "'" "" }}
+                    {{ $parts := split $line " " }}
+                    {{ $url := index $parts 1 }}
+                    {{ $name := index $parts 0 }}
+                    <pre><a target="_blank" href="{{ $url }}">{{ $name }}</a></pre>
+                {{ end }}
+            {{ end }}
+    </div>
+</details>
+