diff --git a/gts/Default.aspx b/gts/Default.aspx
index ad87cfce..5a1ed613 100644
--- a/gts/Default.aspx
+++ b/gts/Default.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/ThreeColumn.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="PkmnFoundations.GTS.Default" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="home" runat="server" />
diff --git a/gts/Default.aspx.designer.cs b/gts/Default.aspx.designer.cs
index f0d73e33..6e21d013 100644
--- a/gts/Default.aspx.designer.cs
+++ b/gts/Default.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// hlBattleVideos control.
diff --git a/gts/admin/AddBoxes.aspx b/gts/admin/AddBoxes.aspx
index 94eda003..0b9223a8 100644
--- a/gts/admin/AddBoxes.aspx
+++ b/gts/admin/AddBoxes.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="AddBoxes.aspx.cs" Inherits="PkmnFoundations.GTS.admin.AddBoxes" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="admin" runat="server" />
diff --git a/gts/admin/AddBoxes.aspx.cs b/gts/admin/AddBoxes.aspx.cs
index 0c9346ba..db814ad0 100644
--- a/gts/admin/AddBoxes.aspx.cs
+++ b/gts/admin/AddBoxes.aspx.cs
@@ -6,6 +6,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using PkmnFoundations.Structures;
 using PkmnFoundations.Data;
+using PkmnFoundations.Web;
 
 namespace PkmnFoundations.GTS.admin
 {
diff --git a/gts/admin/AddBoxes.aspx.designer.cs b/gts/admin/AddBoxes.aspx.designer.cs
index da79158b..54043286 100644
--- a/gts/admin/AddBoxes.aspx.designer.cs
+++ b/gts/admin/AddBoxes.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.admin {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/admin/AddDressup.aspx b/gts/admin/AddDressup.aspx
index 2e03d64a..e55823d0 100644
--- a/gts/admin/AddDressup.aspx
+++ b/gts/admin/AddDressup.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="AddDressup.aspx.cs" Inherits="PkmnFoundations.GTS.test.AddDressup" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="admin" runat="server" />
diff --git a/gts/admin/AddDressup.aspx.cs b/gts/admin/AddDressup.aspx.cs
index 59f5cbbb..fe80fd8c 100644
--- a/gts/admin/AddDressup.aspx.cs
+++ b/gts/admin/AddDressup.aspx.cs
@@ -7,6 +7,7 @@ using System.Web.UI.WebControls;
 using System.IO;
 using PkmnFoundations.Structures;
 using PkmnFoundations.Data;
+using PkmnFoundations.Web;
 
 namespace PkmnFoundations.GTS.test
 {
diff --git a/gts/admin/AddDressup.aspx.designer.cs b/gts/admin/AddDressup.aspx.designer.cs
index b692f9a8..5299655a 100644
--- a/gts/admin/AddDressup.aspx.designer.cs
+++ b/gts/admin/AddDressup.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.test {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/admin/AddMusical.aspx b/gts/admin/AddMusical.aspx
index da08bb8e..32d7eb30 100644
--- a/gts/admin/AddMusical.aspx
+++ b/gts/admin/AddMusical.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="AddMusical.aspx.cs" Inherits="PkmnFoundations.GTS.admin.AddMusical" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="admin" runat="server" />
diff --git a/gts/admin/AddMusical.aspx.designer.cs b/gts/admin/AddMusical.aspx.designer.cs
index 9441d0f2..19354c42 100644
--- a/gts/admin/AddMusical.aspx.designer.cs
+++ b/gts/admin/AddMusical.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.admin {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/admin/Sessions.aspx b/gts/admin/Sessions.aspx
index b8a4b230..d250f600 100644
--- a/gts/admin/Sessions.aspx
+++ b/gts/admin/Sessions.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="Sessions.aspx.cs" Inherits="PkmnFoundations.GTS.admin.Sessions" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="admin" runat="server" />
diff --git a/gts/admin/Sessions.aspx.designer.cs b/gts/admin/Sessions.aspx.designer.cs
index 599c826a..746c8055 100644
--- a/gts/admin/Sessions.aspx.designer.cs
+++ b/gts/admin/Sessions.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.admin {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// litDebug control.
diff --git a/gts/battlevideo/Default.aspx b/gts/battlevideo/Default.aspx
index b16c13fd..d7443aec 100644
--- a/gts/battlevideo/Default.aspx
+++ b/gts/battlevideo/Default.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="PkmnFoundations.GTS.BattleVideo" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="bv" runat="server" />
diff --git a/gts/battlevideo/Default.aspx.designer.cs b/gts/battlevideo/Default.aspx.designer.cs
index 993ce169..a37cd60e 100644
--- a/gts/battlevideo/Default.aspx.designer.cs
+++ b/gts/battlevideo/Default.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/gts/Default.aspx b/gts/gts/Default.aspx
index 74696f24..7539ed31 100644
--- a/gts/gts/Default.aspx
+++ b/gts/gts/Default.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="PkmnFoundations.GTS.AllPokemon" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="gts" runat="server" />
diff --git a/gts/gts/Default.aspx.cs b/gts/gts/Default.aspx.cs
index 7add59a1..d4cb733d 100644
--- a/gts/gts/Default.aspx.cs
+++ b/gts/gts/Default.aspx.cs
@@ -7,6 +7,7 @@ using System.Web.UI.WebControls;
 using PkmnFoundations.Data;
 using PkmnFoundations.Pokedex;
 using PkmnFoundations.Structures;
+using PkmnFoundations.Web;
 
 namespace PkmnFoundations.GTS
 {
diff --git a/gts/gts/Default.aspx.designer.cs b/gts/gts/Default.aspx.designer.cs
index d508f58f..0648c928 100644
--- a/gts/gts/Default.aspx.designer.cs
+++ b/gts/gts/Default.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// rptPokemon4 control.
diff --git a/gts/masters/MasterPage.master b/gts/masters/MasterPage.master
index dfdf4f6a..706eb0d6 100644
--- a/gts/masters/MasterPage.master
+++ b/gts/masters/MasterPage.master
@@ -1,5 +1,5 @@
 <%@ Master Language="C#" AutoEventWireup="true" CodeBehind="MasterPage.master.cs" Inherits="PkmnFoundations.GTS.MasterPage" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <!DOCTYPE html>
 
diff --git a/gts/masters/MasterPage.master.designer.cs b/gts/masters/MasterPage.master.designer.cs
index 51f0b6b9..ee5f3c00 100644
--- a/gts/masters/MasterPage.master.designer.cs
+++ b/gts/masters/MasterPage.master.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// cpHead control.
@@ -55,7 +55,7 @@ namespace PkmnFoundations.GTS {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.RetinaImage imgLogo;
+        protected global::PkmnFoundations.Web.RetinaImage imgLogo;
         
         /// <summary>
         /// litPokemon control.
diff --git a/gts/src/Common.cs b/gts/src/Common.cs
index 92db91a3..8cedc6e3 100644
--- a/gts/src/Common.cs
+++ b/gts/src/Common.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Web;
 using System.IO;
 
-namespace PkmnFoundations.GTS
+namespace PkmnFoundations.Web
 {
     public static class Common
     {
diff --git a/gts/src/HeaderColour.cs b/gts/src/HeaderColour.cs
index ee1ee9d9..e5ceb395 100644
--- a/gts/src/HeaderColour.cs
+++ b/gts/src/HeaderColour.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 
-namespace PkmnFoundations.GTS
+namespace PkmnFoundations.Web
 {
     public class HeaderColour : System.Web.UI.Control
     {
diff --git a/gts/src/RetinaImage.cs b/gts/src/RetinaImage.cs
index 8dcde6a9..97918148 100644
--- a/gts/src/RetinaImage.cs
+++ b/gts/src/RetinaImage.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Globalization;
 
-namespace PkmnFoundations.GTS
+namespace PkmnFoundations.Web
 {
     public class RetinaImage : RetinaImageBase
     {
diff --git a/gts/src/RetinaImageBase.cs b/gts/src/RetinaImageBase.cs
index 8c77f6f9..27a6db82 100644
--- a/gts/src/RetinaImageBase.cs
+++ b/gts/src/RetinaImageBase.cs
@@ -6,7 +6,7 @@ using System.Globalization;
 using System.Web.UI;
 
 
-namespace PkmnFoundations.GTS
+namespace PkmnFoundations.Web
 {
     /// <summary>
     /// asp:Image with retina substitution capabilities
diff --git a/gts/test/BoxUp.aspx b/gts/test/BoxUp.aspx
index ba9f203e..beca34ab 100644
--- a/gts/test/BoxUp.aspx
+++ b/gts/test/BoxUp.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="BoxUp.aspx.cs" Inherits="PkmnFoundations.GTS.debug.BoxUp" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="test" runat="server" />
diff --git a/gts/test/BoxUp.aspx.designer.cs b/gts/test/BoxUp.aspx.designer.cs
index ac66b7fe..00048d67 100644
--- a/gts/test/BoxUp.aspx.designer.cs
+++ b/gts/test/BoxUp.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.debug {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/test/Decode.aspx b/gts/test/Decode.aspx
index 799e0f4c..328ce5cf 100644
--- a/gts/test/Decode.aspx
+++ b/gts/test/Decode.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="Decode.aspx.cs" Inherits="PkmnFoundations.GTS.debug.Decode" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="test" runat="server" />
diff --git a/gts/test/Decode.aspx.designer.cs b/gts/test/Decode.aspx.designer.cs
index 1af66efe..228b3d39 100644
--- a/gts/test/Decode.aspx.designer.cs
+++ b/gts/test/Decode.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.debug {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/test/NameDecode.aspx b/gts/test/NameDecode.aspx
index 59708d3f..07dc53fd 100644
--- a/gts/test/NameDecode.aspx
+++ b/gts/test/NameDecode.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="NameDecode.aspx.cs" Inherits="PkmnFoundations.GTS.test.NameDecode" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="test" runat="server" />
diff --git a/gts/test/NameDecode.aspx.cs b/gts/test/NameDecode.aspx.cs
index 24ecb02e..747acc2a 100644
--- a/gts/test/NameDecode.aspx.cs
+++ b/gts/test/NameDecode.aspx.cs
@@ -6,6 +6,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using PkmnFoundations.Support;
 using GamestatsBase;
+using PkmnFoundations.Web;
 
 namespace PkmnFoundations.GTS.test
 {
@@ -19,7 +20,7 @@ namespace PkmnFoundations.GTS.test
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
             byte[] data = GamestatsBase.Common.FromHexString(txtName.Text.Replace(" ", ""));
-            litName.Text = Common.HtmlEncode(EncodedString4.DecodeString(data));
+            litName.Text = Web.Common.HtmlEncode(EncodedString4.DecodeString(data));
         }
     }
 }
\ No newline at end of file
diff --git a/gts/test/NameDecode.aspx.designer.cs b/gts/test/NameDecode.aspx.designer.cs
index e0a6f7ef..f9f359bc 100644
--- a/gts/test/NameDecode.aspx.designer.cs
+++ b/gts/test/NameDecode.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.test {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.
diff --git a/gts/test/VideoId.aspx b/gts/test/VideoId.aspx
index aac69d20..3ff3c251 100644
--- a/gts/test/VideoId.aspx
+++ b/gts/test/VideoId.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masters/MasterPage.master" AutoEventWireup="true" CodeBehind="VideoId.aspx.cs" Inherits="PkmnFoundations.GTS.test.VideoId" %>
-<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %>
+<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
     <pf:HeaderColour ID="HeaderColour1" CssClass="test" runat="server" />
diff --git a/gts/test/VideoId.aspx.designer.cs b/gts/test/VideoId.aspx.designer.cs
index 5fdbb026..e3ec61b6 100644
--- a/gts/test/VideoId.aspx.designer.cs
+++ b/gts/test/VideoId.aspx.designer.cs
@@ -19,7 +19,7 @@ namespace PkmnFoundations.GTS.test {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1;
+        protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
         
         /// <summary>
         /// theForm control.