diff --git a/TGS.Interface/IServerInterface.cs b/TGS.Interface/IServerInterface.cs
new file mode 100644
index 0000000000..5f96e83302
--- /dev/null
+++ b/TGS.Interface/IServerInterface.cs
@@ -0,0 +1,71 @@
+using System;
+
+namespace TGS.Interface
+{
+	/// <summary>
+	/// Main <see langword="interface"/> for communicating the <see cref="ITGSService"/>
+	/// </summary>
+	public interface IServerInterface : IDisposable
+	{
+		/// <summary>
+		/// The <see cref="Version"/> of the connected <see cref="ITGSService"/>
+		/// </summary>
+		Version ServerVersion { get; }
+
+		/// <summary>
+		/// The name of the current instance in use. Defaults to <see langword="null"/>
+		/// </summary>
+		string InstanceName { get; }
+
+		/// <summary>
+		/// The <see cref="RemoteLoginInfo"/> for the <see cref="IServerInterface"/>. Is <see langword="null"/> for local connections
+		/// </summary>
+		RemoteLoginInfo LoginInfo { get; }
+
+		/// <summary>
+		/// Checks if the <see cref="IServerInterface"/> is setup for a remote connection
+		/// </summary>
+		bool IsRemoteConnection { get; }
+
+		/// <summary>
+		/// Targets <paramref name="instanceName"/> as the instance to use with <see cref="GetComponent{T}"/>. Closes all connections to any previous instance
+		/// </summary>
+		/// <param name="instanceName">The name of the instance to connect to</param>
+		/// <param name="skipChecks">If set to <see langword="true"/>, skips the connectivity and authentication checks, sets <see cref="InstanceName"/>, and returns <see cref="ConnectivityLevel.Connected"/></param>
+		/// <returns>The apporopriate <see cref="ConnectivityLevel"/></returns>
+		ConnectivityLevel ConnectToInstance(string instanceName = null, bool skipChecks = false);
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the <see cref="IServerInterface"/> interface being used to connect to a service does not have the same release version as the service
+		/// </summary>
+		/// <param name="errorMessage">An error message to display to the user should this function return <see langword="true"/></param>
+		/// <returns><see langword="true"/> if the <see cref="IServerInterface"/> interface being used to connect to a service does not have the same release version as the service</returns>
+		bool VersionMismatch(out string errorMessage);
+
+		/// <summary>
+		/// Returns the requested <see cref="IServerInterface"/> component <see langword="interface"/> for the instance <see cref="InstanceName"/>. This does not guarantee a successful connection.
+		/// </summary>
+		/// <typeparam name="T">The component <see langword="interface"/> to retrieve</typeparam>
+		/// <returns>The correct component <see langword="interface"/></returns>
+		T GetComponent<T>();
+
+		/// <summary>
+		/// Returns a root service component
+		/// </summary>
+		/// <returns>The <see cref="ITGSService"/> component for the service</returns>
+		T GetServiceComponent<T>();
+
+		/// <summary>
+		/// Used to test if the <see cref="ITGSService"/> is avaiable on the target machine. Note that state can change at any time and any call into the may throw an exception because of communcation errors
+		/// </summary>
+		/// <returns><see langword="null"/> on successful connection, error message <see cref="string"/> on failure</returns>
+		ConnectivityLevel ConnectionStatus();
+
+		/// <summary>
+		/// Used to test if the <see cref="ITGSService"/> is avaiable on the target machine. Note that state can change at any time and any call into the may throw an exception because of communcation errors
+		/// </summary>
+		/// <param name="error">String of the error that prevented an elevated connectivity level</param>
+		/// <returns>The apporopriate <see cref="ConnectivityLevel"/></returns>
+		ConnectivityLevel ConnectionStatus(out string error);
+	}
+}
diff --git a/TGS.Interface/ServerInterface.cs b/TGS.Interface/ServerInterface.cs
index 0c358d0ba5..728f1d253f 100644
--- a/TGS.Interface/ServerInterface.cs
+++ b/TGS.Interface/ServerInterface.cs
@@ -12,73 +12,6 @@ using TGS.Interface.Components;
 
 namespace TGS.Interface
 {
-	/// <summary>
-	/// Main <see langword="interface"/> for communicating the <see cref="ITGSService"/>
-	/// </summary>
-	public interface IServerInterface : IDisposable
-	{
-		/// <summary>
-		/// The <see cref="Version"/> of the connected <see cref="ITGSService"/>
-		/// </summary>
-		Version ServerVersion { get; }
-
-		/// <summary>
-		/// The name of the current instance in use. Defaults to <see langword="null"/>
-		/// </summary>
-		string InstanceName { get; }
-
-		/// <summary>
-		/// The <see cref="RemoteLoginInfo"/> for the <see cref="IServerInterface"/>. Is <see langword="null"/> for local connections
-		/// </summary>
-		RemoteLoginInfo LoginInfo { get; }
-
-		/// <summary>
-		/// Checks if the <see cref="IServerInterface"/> is setup for a remote connection
-		/// </summary>
-		bool IsRemoteConnection { get; }
-
-		/// <summary>
-		/// Targets <paramref name="instanceName"/> as the instance to use with <see cref="GetComponent{T}"/>. Closes all connections to any previous instance
-		/// </summary>
-		/// <param name="instanceName">The name of the instance to connect to</param>
-		/// <param name="skipChecks">If set to <see langword="true"/>, skips the connectivity and authentication checks, sets <see cref="InstanceName"/>, and returns <see cref="ConnectivityLevel.Connected"/></param>
-		/// <returns>The apporopriate <see cref="ConnectivityLevel"/></returns>
-		ConnectivityLevel ConnectToInstance(string instanceName = null, bool skipChecks = false);
-
-		/// <summary>
-		/// Returns <see langword="true"/> if the <see cref="IServerInterface"/> interface being used to connect to a service does not have the same release version as the service
-		/// </summary>
-		/// <param name="errorMessage">An error message to display to the user should this function return <see langword="true"/></param>
-		/// <returns><see langword="true"/> if the <see cref="IServerInterface"/> interface being used to connect to a service does not have the same release version as the service</returns>
-		bool VersionMismatch(out string errorMessage);
-
-		/// <summary>
-		/// Returns the requested <see cref="IServerInterface"/> component <see langword="interface"/> for the instance <see cref="InstanceName"/>. This does not guarantee a successful connection.
-		/// </summary>
-		/// <typeparam name="T">The component <see langword="interface"/> to retrieve</typeparam>
-		/// <returns>The correct component <see langword="interface"/></returns>
-		T GetComponent<T>();
-
-		/// <summary>
-		/// Returns a root service component
-		/// </summary>
-		/// <returns>The <see cref="ITGSService"/> component for the service</returns>
-		T GetServiceComponent<T>();
-
-		/// <summary>
-		/// Used to test if the <see cref="ITGSService"/> is avaiable on the target machine. Note that state can change at any time and any call into the may throw an exception because of communcation errors
-		/// </summary>
-		/// <returns><see langword="null"/> on successful connection, error message <see cref="string"/> on failure</returns>
-		ConnectivityLevel ConnectionStatus();
-
-		/// <summary>
-		/// Used to test if the <see cref="ITGSService"/> is avaiable on the target machine. Note that state can change at any time and any call into the may throw an exception because of communcation errors
-		/// </summary>
-		/// <param name="error">String of the error that prevented an elevated connectivity level</param>
-		/// <returns>The apporopriate <see cref="ConnectivityLevel"/></returns>
-		ConnectivityLevel ConnectionStatus(out string error);
-	}
-
 	/// <inheritdoc />
 	sealed public class ServerInterface : IServerInterface
 	{
diff --git a/TGS.Interface/TGS.Interface.csproj b/TGS.Interface/TGS.Interface.csproj
index a1b6f3d248..a6a0df7701 100644
--- a/TGS.Interface/TGS.Interface.csproj
+++ b/TGS.Interface/TGS.Interface.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Enumerations.cs" />
     <Compile Include="Helpers.cs" />
     <Compile Include="InstanceMetadata.cs" />
+    <Compile Include="IServerInterface.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Components\Repository.cs" />
     <Compile Include="PullRequestInfo.cs" />