diff --git a/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.nuspec b/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.nuspec
index 68ee40c..c47cf16 100644
--- a/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.nuspec
+++ b/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>4.1.3-alpha</version>
+    <version>$version$</version>
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
diff --git a/Code/Atlantis.Net.Irc/Properties/AssemblyInfo.cs b/Code/Atlantis.Net.Irc/Properties/AssemblyInfo.cs
index e7ba86d..e493021 100644
--- a/Code/Atlantis.Net.Irc/Properties/AssemblyInfo.cs
+++ b/Code/Atlantis.Net.Irc/Properties/AssemblyInfo.cs
@@ -1,4 +1,6 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle("Atlantis.Net.Irc")]
-[assembly: AssemblyFileVersion("4.1.3.0")]
+[assembly: AssemblyDescription("Atlantis.Net.Irc is an implementation of the IRC RFC (not 100%) for my own purposes. It features a very fast IRC message parser, asynchronous message transmission, an event system, and a basic command system.")]
+[assembly: AssemblyFileVersion("4.1.*")]
+[assembly: AssemblyInformationalVersion("4.1.3")]
diff --git a/Code/Atlantis.Net/Atlantis.Net.4.0.2.0.nupkg b/Code/Atlantis.Net/Atlantis.Net.4.0.2.0.nupkg
deleted file mode 100644
index 0002c5d..0000000
Binary files a/Code/Atlantis.Net/Atlantis.Net.4.0.2.0.nupkg and /dev/null differ
diff --git a/Code/Atlantis.Net/Atlantis.Net.csproj b/Code/Atlantis.Net/Atlantis.Net.csproj
deleted file mode 100644
index 208216c..0000000
--- a/Code/Atlantis.Net/Atlantis.Net.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{186F735C-F866-4DE0-8F99-CDE961675397}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Atlantis.Net</RootNamespace>
-    <AssemblyName>Atlantis.Net</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Build\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Build\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="ITcpClient.cs" />
-    <Compile Include="ITcpClientAsync.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TcpClientAdapter.cs" />
-    <Compile Include="TcpClientAsyncAdapter.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Code/Atlantis.Net/Atlantis.Net.nuspec b/Code/Atlantis.Net/Atlantis.Net.nuspec
deleted file mode 100644
index 51ffa8b..0000000
--- a/Code/Atlantis.Net/Atlantis.Net.nuspec
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <projectUrl>https://github.com/Genesis2001/Atlantis/</projectUrl>
-    <description>$description$</description>
-    <copyright>Copyright ©2014 Zack Loveless. All rights reserved.</copyright>
-  </metadata>
-</package>
diff --git a/Code/Atlantis.Net/ITcpClient.cs b/Code/Atlantis.Net/ITcpClient.cs
deleted file mode 100644
index 65bb3d0..0000000
--- a/Code/Atlantis.Net/ITcpClient.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// -----------------------------------------------------------------------------
-//  <copyright file="ITcpClient.cs" company="Zack Loveless">
-//      Copyright (c) Zack Loveless.  All rights reserved.
-//  </copyright>
-// -----------------------------------------------------------------------------
-
-namespace Atlantis.Net
-{
-    using System;
-    using System.IO;
-
-    [Obsolete]
-    public interface ITcpClient
-	{
-		bool Connected { get; }
-
-		bool DataAvailable { get; }
-
-		bool EndOfStream { get; }
-
-        Stream BaseStream { get; }
-
-		void Connect(string host, int port);
-
-		void Close();
-
-		string ReadLine();
-
-		string ReadAll();
-
-		void Write(string format, params object[] args);
-
-		void WriteLine(string format, params object[] args);
-	}
-}
diff --git a/Code/Atlantis.Net/ITcpClientAsync.cs b/Code/Atlantis.Net/ITcpClientAsync.cs
deleted file mode 100644
index a56e4cb..0000000
--- a/Code/Atlantis.Net/ITcpClientAsync.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// -----------------------------------------------------------------------------
-//  <copyright file="ITcpClientAsync.cs" company="Zack Loveless">
-//      Copyright (c) Zack Loveless.  All rights reserved.
-//  </copyright>
-// -----------------------------------------------------------------------------
-
-namespace Atlantis.Net
-{
-    using System;
-    using System.Threading.Tasks;
-
-    [Obsolete]
-	public interface ITcpClientAsync : ITcpClient
-	{
-		Task ConnectAsync(string host, int port);
-
-		Task<string> ReadLineAsync();
-
-		Task<string> ReadAllAsync();
-
-		Task WriteAsync(string format, params object[] args);
-
-		Task WriteLineAsync(string format, params object[] args);
-	}
-}
diff --git a/Code/Atlantis.Net/Properties/AssemblyInfo.cs b/Code/Atlantis.Net/Properties/AssemblyInfo.cs
deleted file mode 100644
index ecd6b4d..0000000
--- a/Code/Atlantis.Net/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("Atlantis.Net")]
-[assembly: AssemblyFileVersion("4.0.2")]
diff --git a/Code/Atlantis.Net/TcpClientAdapter.cs b/Code/Atlantis.Net/TcpClientAdapter.cs
deleted file mode 100644
index a7446a4..0000000
--- a/Code/Atlantis.Net/TcpClientAdapter.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// -----------------------------------------------------------------------------
-//  <copyright file="TcpClientAdapter.cs" company="Zack Loveless">
-//      Copyright (c) Zack Loveless.  All rights reserved.
-//  </copyright>
-// -----------------------------------------------------------------------------
-
-namespace Atlantis.Net
-{
-	using System;
-	using System.IO;
-	using System.Net;
-	using System.Net.Sockets;
-	using System.Text;
-
-    [Obsolete]
-	public class TcpClientAdapter : ITcpClient
-	{
-		private readonly TcpClient client;
-		private readonly Encoding encoding;
-
-		private StreamReader clientReader;
-		private NetworkStream stream;
-
-		public TcpClientAdapter(TcpClient client)
-		{
-			this.client = client;
-			InitializeStreams();
-		}
-
-		public TcpClientAdapter(TcpClient client, Encoding encoding) : this(client)
-		{
-			this.encoding = encoding;
-			InitializeStreams(encoding);
-		}
-
-		private void InitializeStreams(Encoding encoding = null)
-		{
-			if (client == null) return;
-
-			stream = client.GetStream();
-
-			clientReader = new StreamReader(stream, encoding ?? Encoding.Default);
-			// clientWriter = new StreamWriter(stream, encoding ?? Encoding.Default);
-		}
-
-		private string BuildPacket(string format, params object[] args)
-		{
-			return new StringBuilder().AppendFormat(format, args).ToString();
-		}
-
-		private string BuildPackageNewLine(string format, params object[] args)
-		{
-			return new StringBuilder().AppendFormat(format, args).AppendLine().ToString();
-		}
-
-		#region Implementation of ITcpClient
-
-		public bool Connected
-		{
-			get { return client.Connected; }
-		}
-
-		public bool DataAvailable
-		{
-			get { return stream.DataAvailable; }
-		}
-
-		public bool EndOfStream
-		{
-			get { return clientReader.EndOfStream; }
-		}
-
-	    public Stream BaseStream
-	    {
-	        get { return client.GetStream(); }
-	    }
-
-	    public void Connect(string host, int port)
-		{
-			var entry = Dns.GetHostEntry(host);
-			if (entry == null)
-			{
-				throw new ArgumentNullException("host", "Unable to resolve host. Check network configuration.");
-			}
-
-			var connection = new IPEndPoint(entry.AddressList[0], port);
-			client.Connect(connection);
-		}
-
-		public void Close()
-		{
-			client.Close();
-		}
-
-		public string ReadLine()
-		{
-			return clientReader.ReadLine();
-		}
-
-		public string ReadAll()
-		{
-			return clientReader.ReadToEnd();
-		}
-
-		public void Write(string format, params object[] args)
-		{
-			var message = BuildPacket(format, args);
-			var buf = encoding.GetBytes(message);
-
-			stream.Write(buf, 0, buf.Length);
-			//			stream.Flush();
-		}
-
-		public void WriteLine(string format, params object[] args)
-		{
-			var message = BuildPackageNewLine(format, args);
-			var buf = encoding.GetBytes(message);
-
-			stream.Write(buf, 0, buf.Length);
-			//			stream.Flush();
-		}
-
-		#endregion
-	}
-}
diff --git a/Code/Atlantis.Net/TcpClientAsyncAdapter.cs b/Code/Atlantis.Net/TcpClientAsyncAdapter.cs
deleted file mode 100644
index 54de322..0000000
--- a/Code/Atlantis.Net/TcpClientAsyncAdapter.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// -----------------------------------------------------------------------------
-//  <copyright file="TcpClientAsyncAdapter.cs" company="Zack Loveless">
-//      Copyright (c) Zack Loveless.  All rights reserved.
-//  </copyright>
-// -----------------------------------------------------------------------------
-
-namespace Atlantis.Net
-{
-	using System;
-	using System.IO;
-	using System.Net;
-	using System.Net.Sockets;
-	using System.Text;
-	using System.Threading.Tasks;
-
-    [Obsolete]
-	public class TcpClientAsyncAdapter : ITcpClientAsync
-	{
-		private readonly TcpClient client;
-		private Encoding encoding;
-		private StreamReader reader;
-		private NetworkStream stream;
-
-		public TcpClientAsyncAdapter(TcpClient client, Encoding encoding)
-		{
-			this.client   = client;
-			this.encoding = encoding;
-		}
-
-		private void InitializeAdapter(Task task)
-		{
-			if (client == null) return;
-
-			stream = client.GetStream();
-			encoding = encoding ?? new UTF8Encoding(false);
-			reader = new StreamReader(client.GetStream(), encoding);
-		}
-
-		#region Implementation of ITcpClient
-
-		public bool Connected
-		{
-			get { return client != null && client.Connected; }
-		}
-
-		public bool DataAvailable
-		{
-			get { return stream != null && stream.DataAvailable; }
-		}
-
-		public bool EndOfStream
-		{
-			get { return reader.EndOfStream; }
-		}
-
-	    public Stream BaseStream
-	    {
-	        get { return client.GetStream(); }
-	    }
-
-	    public void Connect(string host, int port)
-		{
-			var entry = Dns.GetHostEntry(host);
-			if (entry == null)
-			{
-				throw new ArgumentNullException("host", "Unable to resolve host. Check network configuration.");
-			}
-
-			var connection = new IPEndPoint(entry.AddressList[0], port);
-			client.Connect(connection);
-
-			InitializeAdapter(null);
-		}
-
-		public void Close()
-		{
-			client.Close();
-		}
-
-		public string ReadLine()
-		{
-			var result = reader.ReadLineAsync();
-
-			return result.Result;
-		}
-
-		public string ReadAll()
-		{
-			var result = reader.ReadToEndAsync();
-
-			return result.Result;
-		}
-
-		public void Write(string format, params object[] args)
-		{
-			var s   = string.Format(format, args);
-			var buf = encoding.GetBytes(s);
-
-			stream.Write(buf, 0, buf.Length);
-			stream.Flush();
-		}
-
-		public void WriteLine(string format, params object[] args)
-		{
-			var s = new StringBuilder();
-			if (args.Length == 0) s.Append(format);
-			else s.AppendFormat(format, args);
-			s.AppendLine();
-
-			var buf = encoding.GetBytes(s.ToString());
-
-			stream.Write(buf, 0, buf.Length);
-			stream.Flush();
-		}
-
-		#endregion
-
-		#region Implementation of ITcpClientAsync
-		
-		public Task ConnectAsync(string host, int port)
-		{
-			return client.ConnectAsync(host, port).ContinueWith(InitializeAdapter);
-		}
-
-		public Task<string> ReadLineAsync()
-		{
-			return reader.ReadLineAsync();
-		}
-
-		public Task<string> ReadAllAsync()
-		{
-			return reader.ReadToEndAsync();
-		}
-
-		public Task WriteAsync(string format, params object[] args)
-		{
-			var s = string.Format(format, args);
-
-			var buf = encoding.GetBytes(s);
-			return stream.WriteAsync(buf, 0, buf.Length).ContinueWith(x => stream.Flush());
-		}
-
-		public Task WriteLineAsync(string format, params object[] args)
-		{
-			var s = new StringBuilder();
-			s.AppendFormat(format, args);
-			s.AppendLine();
-
-			var buf = encoding.GetBytes(s.ToString());
-			return stream.WriteAsync(buf, 0, buf.Length).ContinueWith(x => stream.Flush());
-		}
-
-		#endregion
-	}
-}
diff --git a/Code/Atlantis.sln b/Code/Atlantis.sln
index b1ead1c..27cf34b 100644
--- a/Code/Atlantis.sln
+++ b/Code/Atlantis.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atlantis", "Atlantis\Atlantis.csproj", "{3464FCF7-A68E-40CC-A354-32B80E698890}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atlantis.Net", "Atlantis.Net\Atlantis.Net.csproj", "{186F735C-F866-4DE0-8F99-CDE961675397}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atlantis.Net.Irc", "Atlantis.Net.Irc\Atlantis.Net.Irc.csproj", "{07410E3A-D2CF-4A81-BA52-864C8D206664}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{92E16622-1050-47F2-9AC8-F8B3010F8742}"
@@ -26,10 +24,6 @@ Global
 		{3464FCF7-A68E-40CC-A354-32B80E698890}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3464FCF7-A68E-40CC-A354-32B80E698890}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3464FCF7-A68E-40CC-A354-32B80E698890}.Release|Any CPU.Build.0 = Release|Any CPU
-		{186F735C-F866-4DE0-8F99-CDE961675397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{186F735C-F866-4DE0-8F99-CDE961675397}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{186F735C-F866-4DE0-8F99-CDE961675397}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{186F735C-F866-4DE0-8F99-CDE961675397}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07410E3A-D2CF-4A81-BA52-864C8D206664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07410E3A-D2CF-4A81-BA52-864C8D206664}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07410E3A-D2CF-4A81-BA52-864C8D206664}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Code/Atlantis/Atlantis.nuspec b/Code/Atlantis/Atlantis.nuspec
index ae9dc7e..c47cf16 100644
--- a/Code/Atlantis/Atlantis.nuspec
+++ b/Code/Atlantis/Atlantis.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>4.1.0-alpha</version>
+    <version>$version$</version>
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
diff --git a/Code/Atlantis/Properties/AssemblyInfo.cs b/Code/Atlantis/Properties/AssemblyInfo.cs
index 12a9a82..68e3c30 100644
--- a/Code/Atlantis/Properties/AssemblyInfo.cs
+++ b/Code/Atlantis/Properties/AssemblyInfo.cs
@@ -1,4 +1,6 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle("Atlantis")]
-[assembly: AssemblyFileVersion("4.1.0.0")]
+[assembly: AssemblyDescription("Atlantis is a collection of code that is common amongst many pet projects.")]
+[assembly: AssemblyFileVersion("4.1.*")]
+[assembly: AssemblyInformationalVersion("4.1")]
diff --git a/Code/GlobalAssemblyInfo.cs b/Code/GlobalAssemblyInfo.cs
index 3e8e0e0..06f9741 100644
--- a/Code/GlobalAssemblyInfo.cs
+++ b/Code/GlobalAssemblyInfo.cs
@@ -15,10 +15,9 @@
 #endif
 
 [assembly: AssemblyCompany("Zack Loveless")]
-[assembly: AssemblyDescription("Atlantis is a collection of code that is common amongst many pet projects.")]
 [assembly: AssemblyProduct("Atlantis Framework")]
 [assembly: AssemblyCopyright("Copyright \u00a9 2014 Zack Loveless. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: CLSCompliant(true)]
-[assembly: AssemblyVersion("4.1.0.0")]
+[assembly: AssemblyVersion("4.1.*")]
diff --git a/nuget/Atlantis.4.1.nupkg b/nuget/Atlantis.4.1.nupkg
new file mode 100644
index 0000000..f37bc94
Binary files /dev/null and b/nuget/Atlantis.4.1.nupkg differ
diff --git a/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.4.1.0-alpha.nupkg b/nuget/Atlantis.Net.Irc.4.1.0-alpha.nupkg
similarity index 100%
rename from Code/Atlantis.Net.Irc/Atlantis.Net.Irc.4.1.0-alpha.nupkg
rename to nuget/Atlantis.Net.Irc.4.1.0-alpha.nupkg
diff --git a/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.4.1.1-alpha.nupkg b/nuget/Atlantis.Net.Irc.4.1.1-alpha.nupkg
similarity index 100%
rename from Code/Atlantis.Net.Irc/Atlantis.Net.Irc.4.1.1-alpha.nupkg
rename to nuget/Atlantis.Net.Irc.4.1.1-alpha.nupkg
diff --git a/Code/Atlantis.Net.Irc/Atlantis.Net.Irc.4.1.2-alpha.nupkg b/nuget/Atlantis.Net.Irc.4.1.2-alpha.nupkg
similarity index 100%
rename from Code/Atlantis.Net.Irc/Atlantis.Net.Irc.4.1.2-alpha.nupkg
rename to nuget/Atlantis.Net.Irc.4.1.2-alpha.nupkg
diff --git a/nuget/Atlantis.Net.Irc.4.1.3-alpha.nupkg b/nuget/Atlantis.Net.Irc.4.1.3-alpha.nupkg
new file mode 100644
index 0000000..482fde4
Binary files /dev/null and b/nuget/Atlantis.Net.Irc.4.1.3-alpha.nupkg differ
diff --git a/nuget/Atlantis.Net.Irc.4.1.3.nupkg b/nuget/Atlantis.Net.Irc.4.1.3.nupkg
new file mode 100644
index 0000000..20e6b41
Binary files /dev/null and b/nuget/Atlantis.Net.Irc.4.1.3.nupkg differ