16 files changed, 48 insertions, 33 deletions
diff --git a/amber/menu.txt b/amber/menu.txt
index 8811c86..09f2ad9 100644
--- a/amber/menu.txt
+++ b/amber/menu.txt
@@ -1,11 +1,12 @@
 install
   android
   linux
-eip
-  android
-  linux
-  mac
-  windows
-  benefits
-  limitations
-email
+help
+  vpn
+    android
+    linux
+    mac
+    windows
+    benefits
+    limitations
+  email
diff --git a/pages/eip/en.text b/pages/eip/en.text
deleted file mode 100644
index fba7cfa..0000000
--- a/pages/eip/en.text
+++ /dev/null
@@ -1,21 +0,0 @@
-@nav_title = "Internet"
-@title = 'Encrypted Internet'
-
-h2. What is Encrypted Internet?
-
-By using the Encrypted Internet feature of Bitmask, you are able to securely route all your internet traffic through the server of your choice.
-
-With Encrypted Internet you can circumvent censorship, anonymize your location, and block many forms of network surveillance. This type of service is often called a "Personal VPN" (Virtual Private Network). We use the term Encrypted Internet because VPNs have several different uses, many of which have nothing to do with providing you with enhanced security.
-
-For more information, see:
-
-* [[Benefits of using Encrypted Internet => benefits]]
-* [[Limitations of Encrypted Internet => limitations]]
-
-h2. How do I use it?
-
-* [[Android => eip/android]]
-* [[Linux => eip/linux]]
-* [[Mac => eip/mac]]
-* [[Windows => eip/windows]]
-
diff --git a/pages/email/en.text b/pages/help/email/en.text
index 4bc4bfc..4bc4bfc 100644
--- a/pages/email/en.text
+++ b/pages/help/email/en.text
diff --git a/pages/help/en.haml b/pages/help/en.haml
new file mode 100644
index 0000000..2a76e19
--- /dev/null
+++ b/pages/help/en.haml
@@ -0,0 +1,15 @@
+- @title = 'Help'
+
+.h2
+  %i.fa.fa-shield
+  %span
+    [[VPN => help/vpn]]
+
+%p.pad With Bitmask VPN, all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet.
+
+.h2
+  %i.fa.fa-envelope
+  %span
+    [[Encrypted Email => help/email]]
+
+%p.pad Bitmask Encrypted Email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email.
diff --git a/pages/eip/android/en.text b/pages/help/vpn/android/en.text
index f154626..f154626 100644
--- a/pages/eip/android/en.text
+++ b/pages/help/vpn/android/en.text
diff --git a/pages/eip/benefits/en.text b/pages/help/vpn/benefits/en.text
index 1d9391b..1d9391b 100644
--- a/pages/eip/benefits/en.text
+++ b/pages/help/vpn/benefits/en.text
diff --git a/pages/help/vpn/en.text b/pages/help/vpn/en.text
new file mode 100644
index 0000000..45f5fdd
--- /dev/null
+++ b/pages/help/vpn/en.text
@@ -0,0 +1,20 @@
+@title = 'VPN'
+
+h2. What is Bitmask VPN?
+
+By using the Bitmask VPN, you are able to securely route all your internet traffic through the server of your choice.
+
+With Bitmask VPN you can circumvent censorship, anonymize your location, and block many forms of network surveillance.
+
+For more information, see:
+
+* [[Benefits of using Encrypted Internet => benefits]]
+* [[Limitations of Encrypted Internet => limitations]]
+
+h2. How do I use it?
+
+* [[Android => vpn/android]]
+* [[Linux => vpn/linux]]
+* [[Mac => vpn/mac]]
+* [[Windows => vpn/windows]]
+
diff --git a/pages/eip/faq/en.text b/pages/help/vpn/faq/en.text
index 708965f..708965f 100644
--- a/pages/eip/faq/en.text
+++ b/pages/help/vpn/faq/en.text
diff --git a/pages/eip/limitations/en.text b/pages/help/vpn/limitations/en.text
index 146a343..146a343 100644
--- a/pages/eip/limitations/en.text
+++ b/pages/help/vpn/limitations/en.text
diff --git a/pages/eip/limitations/vpn-01_large.png b/pages/help/vpn/limitations/vpn-01_large.png
index 64bad2a..64bad2a 100644
--- a/pages/eip/limitations/vpn-01_large.png
+++ b/pages/help/vpn/limitations/vpn-01_large.png
diff --git a/pages/eip/limitations/vpn-02_large.png b/pages/help/vpn/limitations/vpn-02_large.png
index a2d5355..a2d5355 100644
--- a/pages/eip/limitations/vpn-02_large.png
+++ b/pages/help/vpn/limitations/vpn-02_large.png
diff --git a/pages/eip/limitations/vpn-03_large.png b/pages/help/vpn/limitations/vpn-03_large.png
index 6bfb62a..6bfb62a 100644
--- a/pages/eip/limitations/vpn-03_large.png
+++ b/pages/help/vpn/limitations/vpn-03_large.png
diff --git a/pages/eip/linux/en.text b/pages/help/vpn/linux/en.text
index 31a4675..31a4675 100644
--- a/pages/eip/linux/en.text
+++ b/pages/help/vpn/linux/en.text
diff --git a/pages/eip/mac/en.text b/pages/help/vpn/mac/en.text
index 3429d49..3429d49 100644
--- a/pages/eip/mac/en.text
+++ b/pages/help/vpn/mac/en.text
diff --git a/pages/eip/windows/en.text b/pages/help/vpn/windows/en.text
index d3b1206..d3b1206 100644
--- a/pages/eip/windows/en.text
+++ b/pages/help/vpn/windows/en.text
diff --git a/pages/home/_text.haml b/pages/home/_text.haml
index 3b7289b..cc8b311 100644
--- a/pages/home/_text.haml
+++ b/pages/home/_text.haml
@@ -15,13 +15,13 @@
       .col-sm-10.text-left
         .h2
           %span
-            [[Encrypted Internet => eip]]
-        %p.pad With Encrypted Internet, all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet (this type of service is often called a personal VPN).
+            [[VPN => help/vpn]]
+        %p.pad With Bitmask VPN, all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet.
         %ul.fa-ul.spaced
           %li
             %i.fa-li.fa.fa-check-square
             <b>Thwart Network Surveillance</b><br>
-            Encrypted Internet is very effective at bypassing most censorship and network surveillance by your ISP or country.
+            Bitmask VPN is very effective at bypassing most censorship and network surveillance by your ISP or country.
           %li
             %i.fa-li.fa.fa-check-square
             <b>Anonymize your address</b><br>
@@ -40,7 +40,7 @@
       .col-sm-10.text-left
         .h2
           %span
-            [[Encrypted Email => email]]
+            [[Encrypted Email => help/email]]
         %p.pad Bitmask Encrypted Email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email.
         %ul.fa-ul.spaced
           %li