diff --git a/Phuse/CRC32.cs b/Phuse/CRC32.cs
deleted file mode 100644
index be2f396..0000000
--- a/Phuse/CRC32.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Security.Cryptography;
-
-//-------------------------------------------------------------
-//
-//    Fusenet - The Future of Usenet
-//              http://github.com/fusenet
-//
-//    This library is free software; you can redistribute it
-//    and modify it under the terms of the GNU General Public
-//    License as published by the Free Software Foundation.
-//
-//-------------------------------------------------------------
-
-namespace Phuse
-{
-    internal class CRC32 : HashAlgorithm // Phil Bolduc
-	{
-		private uint m_crc;
-        protected uint[] crc32Table;
-
-        protected static bool autoCache;
-        protected static uint AllOnes = 0xffffffff;
-        protected static Hashtable cachedCRC32Tables;
-
-        public CRC32() : this(DefaultPolynomial) { }
-        public CRC32(uint aPolynomial) : this(aPolynomial, CRC32.AutoCache) { }
-
-        public uint[] CurrentTable { get { return crc32Table; } }
-		public static uint DefaultPolynomial { get { return 0x04C11DB7; } }
-
-		public static bool AutoCache
-		{
-			get { return autoCache; }
-			set { autoCache = value; }
-		}
-
-		static CRC32()
-		{
-			cachedCRC32Tables = Hashtable.Synchronized( new Hashtable() );
-			autoCache = true;
-		}
-
-		public static void ClearCache()
-		{
-			cachedCRC32Tables.Clear();
-		}
-
-		private static uint Reflect(uint val)
-		{
-			uint oval = 0;
-			for (int i=0; i<32; i++)
-			{
-				oval = (oval<<1) + (val&1);
-				val >>= 1;
-			}
-			return oval;
-		}
-
-		protected static uint[] BuildCRC32Table( uint ulPolynomial )
-		{
-			uint dwCrc;
-			uint[] table = new uint[256];
-
-			ulPolynomial = Reflect(ulPolynomial);
-
-			for (int i = 0; i < 256; i++)
-			{
-				dwCrc = (uint)i;
-				for (int j = 8; j > 0; j--)
-				{
-					if((dwCrc & 1) == 1)
-						dwCrc = (dwCrc >> 1) ^ ulPolynomial;
-					else
-						dwCrc >>= 1;
-				}
-				table[i] = dwCrc;
-			}
-
-			return table;
-		}
-
-        public CRC32(uint aPolynomial, bool cacheTable)
-		{
-			this.HashSizeValue = 32;
-
-			crc32Table = (uint []) cachedCRC32Tables[aPolynomial];
-			if ( crc32Table == null )
-			{
-				crc32Table = CRC32.BuildCRC32Table(aPolynomial);
-				if ( cacheTable )
-					cachedCRC32Tables.Add( aPolynomial, crc32Table );
-			}
-			Initialize();
-		}
-	
-		public override void Initialize()
-		{
-			m_crc = AllOnes;
-			this.State = 0;
-		}
-	
-		protected override void HashCore(byte[] buffer, int offset, int count)
-		{
-			for (int i = offset; i < offset + count; i++)
-			{
-				ulong tabPtr = (m_crc & 0xFF) ^ buffer[i];
-				m_crc >>= 8;
-				m_crc ^= crc32Table[tabPtr];
-			}
-
-			this.State = 1;
-		}
-	
-		protected override byte[] HashFinal()
-		{
-			byte [] finalHash = new byte [ 4 ];
-			ulong finalCRC = m_crc ^ AllOnes;
-		
-			finalHash[0] = (byte) ((finalCRC >> 24) & 0xFF);
-			finalHash[1] = (byte) ((finalCRC >> 16) & 0xFF);
-			finalHash[2] = (byte) ((finalCRC >>  8) & 0xFF);
-			finalHash[3] = (byte) ((finalCRC >>  0) & 0xFF);
-		
-			this.State = 0;
-			return finalHash;
-		}
-	}
-} // <T-bF7cOtc7M>
diff --git a/Phuse/README.md b/Phuse/README.md
deleted file mode 100644
index 53b65ba..0000000
--- a/Phuse/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# fusenet
-The Future of Usenet
diff --git a/Phuse/API.cs b/src/API/API.cs
similarity index 91%
rename from Phuse/API.cs
rename to src/API/API.cs
index 894a0b7..515f795 100644
--- a/Phuse/API.cs
+++ b/src/API/API.cs
@@ -21,7 +21,11 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.NNTP;
+using Fusenet.Utils;
+
+namespace Fusenet.API
 {
     public interface Api
     {
@@ -173,7 +177,7 @@ public string Send(string Newsgroup, List<string> Command, CancellationTokenSour
             vSlot.Status = SlotStatus.Downloading;
             Notify();
 
-            WaitHandle wRet = Module.WaitList(wList);
+            WaitHandle wRet = Common.WaitList(wList);
 
             if ((wRet == null) || (wRet.Handle == vToken.Token.WaitHandle.Handle))
             {
@@ -192,7 +196,7 @@ public string Send(string Newsgroup, List<string> Command, CancellationTokenSour
                 }
                 else
                 {
-                    zOut = Module.TranslateStatus((int)vSlot.Status);
+                    zOut = Common.TranslateStatus((int)vSlot.Status);
                 }
 
                 int vId = vSlot.ID;
@@ -216,7 +220,7 @@ public string Send(string Newsgroup, List<string> Command, CancellationTokenSour
                     if (vFile.Output.Data.Length == 0) { continue; }
 
                     vFile.Output.Data.Position = 0;
-                    zOut = Module.GetString(vFile.Output.Data);
+                    zOut = Common.GetString(vFile.Output.Data);
                 }
 
                 int vId = vSlot.ID;
@@ -270,7 +274,7 @@ private void Notify()
 
     //internal class WebHandler : Phocus.Webhandler
     //{
-    //    private Phuse.Engine Engine;
+    //    private Fusenet.Engine Engine;
 
     //    internal WebHandler(Engine zEngine)
     //    {
@@ -442,13 +446,13 @@ internal static bool Slot(XmlWriter xR, VirtualSlot vSlot)
         {
             xR.WriteStartElement("slot");
             xR.WriteElementString("nzo_id", Convert.ToString(vSlot.ID));
-            xR.WriteElementString("name", Module.CleanString(vSlot.Name));
-            xR.WriteElementString("filename", Module.CleanString(vSlot.Name));
-            xR.WriteElementString("status", Module.TranslateStatus((int)vSlot.Status));
+            xR.WriteElementString("name", Common.CleanString(vSlot.Name));
+            xR.WriteElementString("filename", Common.CleanString(vSlot.Name));
+            xR.WriteElementString("status", Common.TranslateStatus((int)vSlot.Status));
 
             if (vSlot.Status == SlotStatus.Failed)
             {
-                xR.WriteElementString("fail_message", Module.CleanString(vSlot.StatusLine));
+                xR.WriteElementString("fail_message", Common.CleanString(vSlot.StatusLine));
             }
 
             if (!(vSlot.History))
@@ -457,21 +461,21 @@ internal static bool Slot(XmlWriter xR, VirtualSlot vSlot)
                 int lSeconds = vInfo.SecondsLeft(vSlot.SpeedAverage, vSlot.TotalTime);
 
                 string sLeft = "00:00:00";
-                string ETA = Module.FormatDate(DateTime.UtcNow);
+                string ETA = Common.FormatDate(DateTime.UtcNow);
 
                 if (lSeconds > 0)
                 {
-                    sLeft = Module.FormatElapsed(new TimeSpan(0, 0, lSeconds));
-                    ETA = Module.FormatDate(DateTime.UtcNow.AddSeconds(lSeconds));
+                    sLeft = Common.FormatElapsed(new TimeSpan(0, 0, lSeconds));
+                    ETA = Common.FormatDate(DateTime.UtcNow.AddSeconds(lSeconds));
                 }
 
                 xR.WriteElementString("index", Convert.ToString(vSlot.Index));
                 xR.WriteElementString("percentage", Convert.ToString(Math.Round(vInfo.Percentage, 0)));
                 xR.WriteElementString("bytes", Convert.ToString(vInfo.Expected));
                 xR.WriteElementString("kbpersec", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", vSlot.Speed / (decimal)1000));
-                xR.WriteElementString("mb", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Module.BytesToMegabytes(vInfo.Expected)));
-                xR.WriteElementString("mbleft", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Module.BytesToMegabytes(vInfo.BytesLeft)));
-                xR.WriteElementString("size", String.Format(CultureInfo.InvariantCulture, "{0:0.0}", Module.BytesToMegabytes(vInfo.Expected)) + " MB");
+                xR.WriteElementString("mb", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Common.BytesToMegabytes(vInfo.Expected)));
+                xR.WriteElementString("mbleft", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Common.BytesToMegabytes(vInfo.BytesLeft)));
+                xR.WriteElementString("size", String.Format(CultureInfo.InvariantCulture, "{0:0.0}", Common.BytesToMegabytes(vInfo.Expected)) + " MB");
                 xR.WriteElementString("eta", ETA);
                 xR.WriteElementString("timeleft", sLeft);
                 xR.WriteElementString("priority", "Normal");
@@ -517,25 +521,25 @@ internal static bool Slots(XmlWriter xR, Slots vSlots)
             NNTPInfo vInfo = vSlots.Info;
 
             string sLeft = "00:00:00";
-            string ETA = Module.FormatDate(DateTime.UtcNow);
+            string ETA = Common.FormatDate(DateTime.UtcNow);
             int lSeconds = vInfo.SecondsLeft(vSlots.SpeedAverage, vSlots.TotalTime);
 
             if (lSeconds > 0)
             {
                 sLeft = new TimeSpan(0, 0, 0, lSeconds, 0).ToString("c");
-                ETA = Module.FormatDate(DateTime.UtcNow.AddSeconds(lSeconds));
+                ETA = Common.FormatDate(DateTime.UtcNow.AddSeconds(lSeconds));
             }
 
             xR.WriteElementString("status", vSlots.Status);
-            xR.WriteElementString("paused", Module.BoolToString(vSlots.Paused));
-            xR.WriteElementString("mb", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Module.BytesToMegabytes(Math.Abs(vInfo.Expected))));
-            xR.WriteElementString("mbleft", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Module.BytesToMegabytes(Math.Abs(vInfo.BytesLeft))));
+            xR.WriteElementString("paused", Common.BoolToString(vSlots.Paused));
+            xR.WriteElementString("mb", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Common.BytesToMegabytes(Math.Abs(vInfo.Expected))));
+            xR.WriteElementString("mbleft", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", Common.BytesToMegabytes(Math.Abs(vInfo.BytesLeft))));
             xR.WriteElementString("kbpersec", String.Format(CultureInfo.InvariantCulture, "{0:0.00}", vSlots.Speed / (decimal)1000));
 
             xR.WriteElementString("eta", ETA);
             xR.WriteElementString("timeleft", sLeft);
 
-            xR.WriteElementString("uptime", Module.FormatElapsed(vSlots.Uptime));
+            xR.WriteElementString("uptime", Common.FormatElapsed(vSlots.Uptime));
             xR.WriteElementString("start", "0");
             xR.WriteElementString("limit", "0");
             xR.WriteElementString("speedlimit", "0");
@@ -545,8 +549,8 @@ internal static bool Slots(XmlWriter xR, Slots vSlots)
 
             if (vSlots.Log.Count > 0) 
             {
-                string sWarning = Module.ReadLog(vSlots.Log, 1).Replace(Environment.NewLine, "");
-                xR.WriteElementString("last_warning", Module.CleanString(sWarning)); 
+                string sWarning = Common.ReadLog(vSlots.Log, 1).Replace(Environment.NewLine, "");
+                xR.WriteElementString("last_warning", Common.CleanString(sWarning)); 
             }
            
             // TODO Server.Log
@@ -567,9 +571,9 @@ internal static bool Server(XmlWriter xR, VirtualServer vServer)
             xR.WriteElementString("nzo_id", Convert.ToString((vServer.ID)));
             xR.WriteElementString("host", vServer.Host);
             xR.WriteElementString("port", Convert.ToString(vServer.Port));
-            xR.WriteElementString("ssl", Module.BoolToString(vServer.SSL));
-            xR.WriteElementString("username", Module.CleanString(vServer.Username));
-            xR.WriteElementString("password", Module.Repeat("*", vServer.Password.Length));
+            xR.WriteElementString("ssl", Common.BoolToString(vServer.SSL));
+            xR.WriteElementString("username", Common.CleanString(vServer.Username));
+            xR.WriteElementString("password", Common.Repeat("*", vServer.Password.Length));
             xR.WriteElementString("priority", TranslatePriority(vServer.Priority));
             xR.WriteElementString("connections", Convert.ToString(vServer.Connections.Count(vServer.ID)));
             xR.WriteEndElement();
diff --git a/Phuse/Engine.cs b/src/Core/Engine.cs
similarity index 98%
rename from Phuse/Engine.cs
rename to src/Core/Engine.cs
index c54a651..ca2f454 100644
--- a/Phuse/Engine.cs
+++ b/src/Core/Engine.cs
@@ -7,6 +7,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using Fusenet.API;
 
 //-------------------------------------------------------------
 //
@@ -19,7 +20,7 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+namespace Fusenet.Core
 {
     public class Engine
     {
diff --git a/Phuse/Scheduler.cs b/src/Core/Scheduler.cs
similarity index 93%
rename from Phuse/Scheduler.cs
rename to src/Core/Scheduler.cs
index f25f984..0746024 100644
--- a/Phuse/Scheduler.cs
+++ b/src/Core/Scheduler.cs
@@ -4,9 +4,9 @@
 using System.Text;
 using System.Linq;
 using System.Threading;
+using System.Diagnostics;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 
 //-------------------------------------------------------------
 //
@@ -19,15 +19,19 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.API;
+using Fusenet.NNTP;
+using Fusenet.Utils;
+
+namespace Fusenet.Core
 {
     internal class Scheduler
     {
         internal Connections Connections;
         internal Slots Slots = new Slots();
 
-        private IndexedCollection zStacks = new IndexedCollection();
-        private IndexedCollection zServers = new IndexedCollection();
+        private Utils.IndexedCollection zStacks = new Utils.IndexedCollection();
+        private Utils.IndexedCollection zServers = new Utils.IndexedCollection();
 
         internal Scheduler()
         {
@@ -40,7 +44,7 @@ internal Scheduler()
         }
 
         public int Count { get { return zServers.Count; } }
-        private IndexedCollection Servers { get { return zServers; } }
+        private Utils.IndexedCollection Servers { get { return zServers; } }
         //internal List<string> ListSID() { return zServers.SIDList(-1); }
         private bool SlotExist(int SlotID) { return (Slots.ContainsKey(SlotID)); }
         private bool StackExist(int ServerID) { return zStacks.ContainsKey(ServerID); }
@@ -88,7 +92,7 @@ internal bool Remove(int ServerID = -1)
         //    return Remove(zServers.GetID(ServerSID));
         //}
 
-        internal IndexedCollection Stack(int ServerID, int SlotID)
+        internal Utils.IndexedCollection Stack(int ServerID, int SlotID)
         {
             if (!SlotExist(SlotID)) { return null; }
             if (Servers.Item(ServerID) == null) { return null; }
@@ -109,9 +113,9 @@ internal bool Close()
             return true;
         }
 
-        internal IndexedCollection SwitchStack(int SlotID, VirtualConnection vConnection)
+        internal Utils.IndexedCollection SwitchStack(int SlotID, VirtualConnection vConnection)
         {
-            IndexedCollection iStack = null;
+            Utils.IndexedCollection iStack = null;
             List<int> AvailableStacks = null;
 
             while(true)
@@ -218,16 +222,16 @@ private List<int> WaitingSlots
             }
         }
 
-        private List<IndexedCollection> WaitingStacks(int ServerID)
+        private List<Utils.IndexedCollection> WaitingStacks(int ServerID)
         {
-            List<IndexedCollection> cList = new List<IndexedCollection>();
+            List<Utils.IndexedCollection> cList = new List<Utils.IndexedCollection>();
 
             if (!StackExist(ServerID)) { return cList; }
             if (!ServerActive(ServerID)) { return cList; }
 
             foreach (VirtualSlot vSlot in RandomSlots())
             {
-                IndexedCollection tStack = Stack(ServerID, vSlot.ID);
+                Utils.IndexedCollection tStack = Stack(ServerID, vSlot.ID);
                 if ((tStack != null) && (!tStack.IsEmpty)) { cList.Add(tStack); }
             }
 
@@ -243,7 +247,7 @@ private List<VirtualSlot> RandomSlots()
 
             while (iList.Count > 0) 
             {
-                int RandomID = iList[Module.Random.Next(0, iList.Count - 1)];
+                int RandomID = iList[Utils.Common.Random.Next(0, iList.Count - 1)];
 
                 VirtualSlot vSlot = Slots.Item(RandomID);
 
@@ -299,7 +303,7 @@ internal string XML
             get 
             {
                 StringBuilder sX = new StringBuilder();
-                XmlWriter xR = Module.CreateWriter(sX);
+                XmlWriter xR = Common.CreateWriter(sX);
 
                 if (!(WriteXML(xR))) { return ""; }
 
@@ -373,29 +377,29 @@ public string Log
 
         private string lDebug
         {
-            get { return Module.ReadLog(DebugLog, 500); }
+            get { return Common.ReadLog(DebugLog, 500); }
         }
 
         private string lStatus
         {
-            get { return Module.ReadLog(StatusLog, 500); }
+            get { return Common.ReadLog(StatusLog, 500); }
         }
 
         internal void WriteDebug(string sCode, string sMsg)
         {
             //Debug.WriteLine("Debug: " + sMsg);
-            DebugLog.Enqueue(Module.MakeMsg(sCode, sMsg));
+            DebugLog.Enqueue(Common.MakeMsg(sCode, sMsg));
         }
 
         internal void WriteStatus(string sMsg)
         {
             //Debug.WriteLine("Status: " + sMsg);
-            StatusLog.Enqueue(Module.MakeMsg("000", sMsg));
+            StatusLog.Enqueue(Common.MakeMsg("000", sMsg));
         }
 
         internal void LogError(int CommandID, NNTPError zErr)
         {
-            WriteStatus("Command #" + Convert.ToString(CommandID) + " - Error " + Module.MakeErr(zErr));
+            WriteStatus("Command #" + Convert.ToString(CommandID) + " - Error " + Common.MakeErr(zErr));
         }
 
         internal bool WriteXML(XmlWriter xR)
diff --git a/Phuse/Slots.cs b/src/Core/Slots.cs
similarity index 96%
rename from Phuse/Slots.cs
rename to src/Core/Slots.cs
index 19673a5..78c278e 100644
--- a/Phuse/Slots.cs
+++ b/src/Core/Slots.cs
@@ -1,11 +1,11 @@
 using System;
+using System.Xml;
 using System.Linq;
-using System.Collections.Generic;
 using System.Text;
-using System.Collections.Concurrent;
 using System.Threading;
-using System.Xml;
 using System.Diagnostics;
+using System.Collections.Generic;
+using System.Collections.Concurrent;
 
 //-------------------------------------------------------------
 //
@@ -18,7 +18,12 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.API;
+using Fusenet.Core;
+using Fusenet.NNTP;
+using Fusenet.Utils;
+
+namespace Fusenet.Core
 {
     internal class Slots : VirtualItem 
     {
@@ -34,8 +39,8 @@ internal Slots()
         }
 
         public int Count { get { return zCol.Count; } }
-        internal string XML { get { return Module.XmlToString(this); } }
-        public NNTPInfo Info { get { return Module.CountInfo(VirtualList); } }
+        internal string XML { get { return Common.XmlToString(this); } }
+        public NNTPInfo Info { get { return Common.CountInfo(VirtualList); } }
         internal bool ContainsKey(int SlotID) { return zCol.ContainsKey(SlotID); }
         internal List<int> ListID(int SlotID = -1) { return zCol.KeyList(SlotID); }
         internal VirtualSlot Item(int SlotID) { return (VirtualSlot)zCol.Item(SlotID); }
@@ -243,7 +248,7 @@ public int Index
         public int Count { get { return zCol.Count; } }
         public long TotalTime { get { return zStats.TotalTime; } }
         public ManualResetEventSlim WaitHandle { get { return zWait; } }
-        public NNTPInfo Info { get { return Module.CountInfo(VirtualList); } }
+        public NNTPInfo Info { get { return Common.CountInfo(VirtualList); } }
         public bool WriteXML(XmlWriter xR) { return (ApiXML.Slot(xR, this)); }
         internal void Progress(long AddedBytes) { zStats.Progress(AddedBytes); }
         internal List<int> ListID(int FileID = -1) { return zCol.KeyList(FileID); }
@@ -428,7 +433,7 @@ internal VirtualFile(string sName, List<NNTPSegment> cList)
         internal NNTPOutput Output { get { return zOutput; } } 
         internal bool IsCompleted { get { return zCol.IsCompleted; } }
         public List<VirtualItem> VirtualList { get { return null; } }
-        internal string Log { get { return Module.ReadLog(ErrorLog, 50); } }
+        internal string Log { get { return Common.ReadLog(ErrorLog, 50); } }
         public int Count { get { return (int)Interlocked.Read(ref zTotal); } }
         internal void Progress(long AddedBytes) { zStats.Progress(AddedBytes); }
         internal bool Remove(int CommandID = -1) { return zCol.Remove(CommandID); }
@@ -474,7 +479,7 @@ private bool Add(List<NNTPSegment> cList)
             if (cList == null) { return false; }
             if (cList.Count == 0) { return false; }
 
-            Module.Safe32(ref zTotal, cList.Count);
+            Common.Safe32(ref zTotal, cList.Count);
 
             cList.Sort();
 
@@ -495,7 +500,7 @@ private bool Add(List<NNTPSegment> cList)
 
             }
 
-            Module.Safe32(ref zExpected, cSize);
+            Common.Safe32(ref zExpected, cSize);
             zCol = new IndexedCollection(cOut);
             return true;
         }
@@ -510,7 +515,7 @@ internal void LogError(int CommandID, NNTPError zErr)
             //Debug.WriteLine(Module.MakeMsg(Convert.ToString(zErr.Code), "Command #" + Convert.ToString(CommandID) + " - Error " + Module.MakeErr(zErr)));
 
             Errors.Enqueue(zErr.Message.Replace(Environment.NewLine, ""));
-            ErrorLog.Enqueue(Module.MakeMsg(Convert.ToString(zErr.Code), "Command #" + Convert.ToString(CommandID) + " - Error " + Module.MakeErr(zErr)));
+            ErrorLog.Enqueue(Common.MakeMsg(Convert.ToString(zErr.Code), "Command #" + Convert.ToString(CommandID) + " - Error " + Common.MakeErr(zErr)));
         }
     }
 } // <Y5v6dd7WHTQ>
\ No newline at end of file
diff --git a/Phuse/Phuse.csproj b/src/Fusenet.csproj
similarity index 76%
rename from Phuse/Phuse.csproj
rename to src/Fusenet.csproj
index 5ff98f1..c8775cc 100644
--- a/Phuse/Phuse.csproj
+++ b/src/Fusenet.csproj
@@ -11,13 +11,12 @@
     <StartupObject>
     </StartupObject>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Phuse</RootNamespace>
+    <RootNamespace>Fusenet</RootNamespace>
     <AssemblyName>Fusenet</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -55,19 +54,20 @@
     <Import Include="System.Diagnostics" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="API.cs" />
-    <Compile Include="Collection.cs" />
-    <Compile Include="Decoder.cs" />
-    <Compile Include="Module.cs" />
-    <Compile Include="Connections.cs" />
-    <Compile Include="Engine.cs" />
-    <Compile Include="NNTP.cs" />
-    <Compile Include="NZB.cs" />
-    <Compile Include="Slots.cs" />
-    <Compile Include="Socket.cs" />
-    <Compile Include="Scheduler.cs" />
-    <Compile Include="Task.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Resources\AssemblyInfo.cs" />
+    <Compile Include="API\API.cs" />
+    <Compile Include="Utils\Collection.cs" />
+    <Compile Include="NNTP\Decoder.cs" />
+    <Compile Include="Utils\Module.cs" />
+    <Compile Include="NNTP\Connections.cs" />
+    <Compile Include="Core\Engine.cs" />
+    <Compile Include="NNTP\NNTP.cs" />
+    <Compile Include="NNTP\NZB.cs" />
+    <Compile Include="Core\Slots.cs" />
+    <Compile Include="Utils\Socket.cs" />
+    <Compile Include="Core\Scheduler.cs" />
+    <Compile Include="NNTP\Task.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.
diff --git a/Phuse/Connections.cs b/src/NNTP/Connections.cs
similarity index 97%
rename from Phuse/Connections.cs
rename to src/NNTP/Connections.cs
index 2b93ebf..87c3ced 100644
--- a/Phuse/Connections.cs
+++ b/src/NNTP/Connections.cs
@@ -17,7 +17,10 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.Utils;
+
+namespace Fusenet.NNTP
 {
     internal class Connections
     {
@@ -142,7 +145,7 @@ internal VirtualConnection Add(int ServerID)
 
     } // <7P-BHcV0_SQ>
 
-    internal class VirtualConnection : IndexedObject 
+    internal class VirtualConnection : Utils.IndexedObject 
     {
         private int zID;
         private int zIndex;
@@ -245,7 +248,7 @@ public bool Enabled
 
         internal void LogError(int CommandID, NNTPError zErr)
         {
-            Srv.WriteStatus("Command #" + Convert.ToString(CommandID) + " - Error " + Module.MakeErr(zErr));
+            Srv.WriteStatus("Command #" + Convert.ToString(CommandID) + " - Error " + Common.MakeErr(zErr));
         }
 
     }
diff --git a/Phuse/Decoder.cs b/src/NNTP/Decoder.cs
similarity index 95%
rename from Phuse/Decoder.cs
rename to src/NNTP/Decoder.cs
index 659ef57..206aab9 100644
--- a/Phuse/Decoder.cs
+++ b/src/NNTP/Decoder.cs
@@ -13,7 +13,10 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.Utils;
+
+namespace Fusenet.NNTP
 {
     internal interface ArticleDecoder
     {
@@ -83,7 +86,7 @@ internal PartInfo DecodePart(string sLine)
             return new PartInfo(zBegin, zEnd);
         }
 
-        internal FileInfo DecodeHeader(string sLine)
+        internal Core.FileInfo DecodeHeader(string sLine)
         {
             int c = sLine.IndexOf("name");
 
@@ -102,7 +105,7 @@ internal FileInfo DecodeHeader(string sLine)
             int fSize = int.Parse(sLine.Substring(b + 5, e - b - 5));
             string fName = sLine.Substring(sLine.IndexOf("name=") + 5);
 
-            return new FileInfo(fName, fSize);          
+            return new Core.FileInfo(fName, fSize);          
         }
 
         public Stream DecodeBytes(Stream Data, int Length)
diff --git a/Phuse/NNTP.cs b/src/NNTP/NNTP.cs
similarity index 97%
rename from Phuse/NNTP.cs
rename to src/NNTP/NNTP.cs
index 42e400c..2ea13a9 100644
--- a/Phuse/NNTP.cs
+++ b/src/NNTP/NNTP.cs
@@ -21,7 +21,10 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.Utils;
+
+namespace Fusenet.NNTP
 {
     internal class VirtualNNTP
     {
@@ -113,9 +116,9 @@ private void iReceived(object sender, WorkArgs e)
                 {
                     if (e.Data.Length >= lBOFLength)
                     {
-                        sBOF = Module.GetBOF(e.Data, lBOFLength);
+                        sBOF = Common.GetBOF(e.Data, lBOFLength);
 
-                        StatusCode = Module.GetCode(sBOF);
+                        StatusCode = Common.GetCode(sBOF);
 
                         switch (StatusCode)
                         {
@@ -141,7 +144,7 @@ private void iReceived(object sender, WorkArgs e)
 
                 if (lPos >= 0)
                 {
-                    sEOF = Module.GetEOF(e.Data, lEOFLength);
+                    sEOF = Common.GetEOF(e.Data, lEOFLength);
 
                     switch (SocketStatus)
                     {
@@ -152,7 +155,7 @@ private void iReceived(object sender, WorkArgs e)
 
                         default:
 
-                            bFinished = (Module.VbRight(sEOF, 2) == Environment.NewLine);
+                            bFinished = (Common.VbRight(sEOF, 2) == Environment.NewLine);
                             break;
                     }
                 }
@@ -180,7 +183,7 @@ private void Process(int NNTPCode, Stream bData)
 
             if (SocketStatus != NNTPStatus.Multiline)
             {
-                sHeader = Module.GetReader(bData).ReadLine();
+                sHeader = Common.GetReader(bData).ReadLine();
             }
 
             //iServer.WriteDebug(Module.VbLeft((Convert.ToString(NNTPCode) + "000"), 3), sHeader);
@@ -304,7 +307,7 @@ internal bool SendLines(string sCommand, int ExpectedBytesReturned = 0, bool bRe
                     return false;
                 }
 
-                if (!iSocket.Send(Module.GetStream(sCommand), ExpectedBytesReturned))
+                if (!iSocket.Send(Common.GetStream(sCommand), ExpectedBytesReturned))
                 {
                     return false;
                 }
@@ -354,11 +357,11 @@ public bool Connect()
                 {
                     if (!iServer.SSL)
                     {
-                        iSocket = new Socket();
+                        iSocket = new Utils.Socket();
                     }
                     else
                     {
-                        iSocket = new SSLSocket();
+                        iSocket = new Utils.SSLSocket();
                     }
 
                     iSocket.Received += new EventHandler<WorkArgs>(iReceived);
@@ -611,7 +614,7 @@ public NNTPCommands ExecuteCommand(NNTPCommands zCommand, CancellationToken cCan
             {
                 if ((!base.IsConnected) || (base.SocketStatus == NNTPStatus.Closed) || (base.SocketStatus == NNTPStatus.Connecting))
                 {
-                    base.Disconnect((int)NNTPCodes.SocketTimedOut, Module.TranslateError(SocketError.TimedOut).Message, false);
+                    base.Disconnect((int)NNTPCodes.SocketTimedOut, Common.TranslateError(SocketError.TimedOut).Message, false);
                 }
 
                 VirtualEvent.Wait(-1, cCancel);
@@ -707,7 +710,7 @@ private void VirtualEvents_Response(int NNTPCode, string sLine, VirtualNNTP send
 
                 if (cCommand.Finished)
                 {
-                    Done(Module.GetStream(sLine));
+                    Done(Common.GetStream(sLine));
                     return;
                 }
                 else
diff --git a/Phuse/NZB.cs b/src/NNTP/NZB.cs
similarity index 95%
rename from Phuse/NZB.cs
rename to src/NNTP/NZB.cs
index b396eac..494eaba 100644
--- a/Phuse/NZB.cs
+++ b/src/NNTP/NZB.cs
@@ -16,7 +16,10 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.Utils;
+
+namespace Fusenet.NNTP
 {
     static class NZB
     {
@@ -27,7 +30,7 @@ internal static List<NNTPInput> Parse(Stream xXML)
 
             try
             {
-                XmlReader xR = XmlReader.Create(xXML, Module.ReaderSettings);
+                XmlReader xR = XmlReader.Create(xXML, Common.ReaderSettings);
 
                 while (xR.ReadToFollowing("file"))
                 {
diff --git a/Phuse/Task.cs b/src/NNTP/Task.cs
similarity index 96%
rename from Phuse/Task.cs
rename to src/NNTP/Task.cs
index e09a8be..fea6a98 100644
--- a/Phuse/Task.cs
+++ b/src/NNTP/Task.cs
@@ -20,7 +20,10 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.Utils;
+
+namespace Fusenet.NNTP
 {
     internal class ConnectionTask
     {
@@ -105,7 +108,7 @@ internal WaitHandle Wait(VirtualConnection vConnection, int lMilliseconds = 100)
             wList.Add(vConnection.Idle.WaitHandle);
             wList.Add(vConnection.Token.Token.WaitHandle);
 
-            WaitHandle wHandle = Module.WaitList(wList, lMilliseconds);
+            WaitHandle wHandle = Common.WaitList(wList, lMilliseconds);
 
             if ((wHandle != null) && (wHandle.Handle == vConnection.Idle.WaitHandle.Handle))
             { 
@@ -186,7 +189,7 @@ private void Process(NNTPCommands zCommand, VirtualConnection vCon)
                                 }
                                 else
                                 {
-                                    cList.Add(Module.MostFrequent(vFile.Errors.GetEnumerator()));
+                                    cList.Add(Common.MostFrequent(vFile.Errors.GetEnumerator()));
                                 }
                             }
 
@@ -196,7 +199,7 @@ private void Process(NNTPCommands zCommand, VirtualConnection vCon)
                             }
                             else
                             {
-                                vSlot.StatusLine = Module.MostFrequent(cList.GetEnumerator());
+                                vSlot.StatusLine = Common.MostFrequent(cList.GetEnumerator());
                                 if (vSlot.StatusLine.Length == 0) { vSlot.StatusLine = "No data"; }
                                 vSlot.Status = SlotStatus.Failed;
                             }
@@ -219,7 +222,7 @@ private bool DecodeArticle(NNTPCommands zCommand)
             string zLine = null;
 
             ArticleDecoder decoder = null;
-            StreamReader sr = Module.GetReader((MemoryStream)zCommand.Data);
+            StreamReader sr = Common.GetReader((MemoryStream)zCommand.Data);
 
             while (!sr.EndOfStream)
             {
diff --git a/src/Program.cs b/src/Program.cs
new file mode 100644
index 0000000..7c906e6
--- /dev/null
+++ b/src/Program.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Collections.Generic;
+
+namespace Fusenet
+{
+    class Main
+    {
+        // Fusenet library
+    }
+
+} // <lPTNM7TOW6U>
diff --git a/src/README.md b/src/README.md
new file mode 100644
index 0000000..a7797ff
--- /dev/null
+++ b/src/README.md
@@ -0,0 +1,10 @@
+# Fusenet
+
+Fast NNTP client in C#
+
+Features:
+
+- Nzb support
+- Par2 repair
+- Live media streaming
+- SABnzbd API compatible 
diff --git a/Phuse/AssemblyInfo.cs b/src/Resources/AssemblyInfo.cs
similarity index 83%
rename from Phuse/AssemblyInfo.cs
rename to src/Resources/AssemblyInfo.cs
index a84c2cb..96b5749 100644
--- a/Phuse/AssemblyInfo.cs
+++ b/src/Resources/AssemblyInfo.cs
@@ -17,14 +17,14 @@
 //-------------------------------------------------------------
 
 [assembly: AssemblyTitle("Fusenet")]
-[assembly: AssemblyDescription("Phuse NNTP Library")]
-[assembly: AssemblyCompany("Fusenet")]
-[assembly: AssemblyProduct("Phuse")]
+[assembly: AssemblyDescription("Fusenet NNTP Library")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Fusenet")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 
 [assembly: ComVisible(false)]
-[assembly: Guid("b6d4fe71-6fb7-4548-380e-6e13f13edfe7")]
+[assembly: Guid("c6d4fe71-6fb7-4548-380e-6e13f13edfe7")]
 
 [assembly: AssemblyVersion("0.9.2.0")]
 [assembly: AssemblyFileVersion("0.9.2.0")]
diff --git a/Phuse/Collection.cs b/src/Utils/Collection.cs
similarity index 96%
rename from Phuse/Collection.cs
rename to src/Utils/Collection.cs
index dd1dd11..9181a54 100644
--- a/Phuse/Collection.cs
+++ b/src/Utils/Collection.cs
@@ -16,7 +16,7 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+namespace Fusenet.Utils
 {
     internal class IndexedCollection : IndexedObject 
     {
@@ -115,7 +115,7 @@ internal IndexedObject Item(int ID)
 
         internal List<int> KeyList(int KeyID = -1)
         {
-            if (KeyID == -1) { return Module.EnumInt(zCol.Keys.GetEnumerator()); }
+            if (KeyID == -1) { return Common.EnumInt(zCol.Keys.GetEnumerator()); }
             List<int> sList = new List<int>();
             if (zCol.ContainsKey(KeyID)) { sList.Add(KeyID); }
             return sList;
@@ -139,7 +139,7 @@ internal List<IndexedObject> ObjectList(int ObjectID = -1)
 
             if (ObjectID == -1)
             {
-                foreach (IndexedObject cItem in Module.EnumObj(zCol.Values.GetEnumerator()))
+                foreach (IndexedObject cItem in Common.EnumObj(zCol.Values.GetEnumerator()))
                 {
                     sList.Add(cItem);
                 }
@@ -157,7 +157,7 @@ private int Next
             get
             {
                 if (zCol.IsEmpty) { return -1; }
-                List<IndexedObject> oList = Module.EnumObj(zCol.Values.GetEnumerator());
+                List<IndexedObject> oList = Common.EnumObj(zCol.Values.GetEnumerator());
                 if (oList.Count == 0) { return -1; }
 
                 oList.Sort();
diff --git a/Phuse/Module.cs b/src/Utils/Module.cs
similarity index 97%
rename from Phuse/Module.cs
rename to src/Utils/Module.cs
index a629f80..6a2ccd0 100644
--- a/Phuse/Module.cs
+++ b/src/Utils/Module.cs
@@ -23,7 +23,11 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.Core;
+using Fusenet.NNTP;
+using Fusenet.Utils;
+
+namespace Fusenet.Utils
 {
     internal enum ArticleEncoding : int
 	{
@@ -283,37 +287,37 @@ internal class Stats
 
         internal long TotalTime
         {
-            set { Module.Safe32(ref zTotalTime, value); }
+            set { Common.Safe32(ref zTotalTime, value); }
             get { return Interlocked.Read(ref zTotalTime); }
         }
 
         internal long TotalBytes
         {
-            set { Module.Safe32(ref zTotalBytes, value); }
+            set { Common.Safe32(ref zTotalBytes, value); }
             get { return Interlocked.Read(ref zTotalBytes); }
         }
 
         internal long FakeBytes
         {
-            set { Module.Safe32(ref zFakeBytes, value); }
+            set { Common.Safe32(ref zFakeBytes, value); }
             get { return Interlocked.Read(ref zFakeBytes); }
         }
 
         internal long LastTime
         {
-            set { Module.Safe32(ref zLastTime, value); }
+            set { Common.Safe32(ref zLastTime, value); }
             get { return Interlocked.Read(ref zLastTime); }
         }
 
         private long LastReset
         {
-            set { Module.Safe32(ref zLastReset, value); }
+            set { Common.Safe32(ref zLastReset, value); }
             get { return Interlocked.Read(ref zLastReset); }
         }
 
         internal long LastBytes
         {
-            set { Module.Safe32(ref zLastBytes, value); }
+            set { Common.Safe32(ref zLastBytes, value); }
             get { return Interlocked.Read(ref zLastBytes); }
         }
 
@@ -329,23 +333,23 @@ internal void ValidateCache()
 
         internal void Progress(long AddedBytes)
         {
-            Module.Add32(ref zFakeBytes, AddedBytes);
+            Common.Add32(ref zFakeBytes, AddedBytes);
         }
 
         internal void Statistics(long AddedBytes, long AddedTime)
         {
             ValidateCache();
 
-            Module.Add32(ref zLastTime, AddedTime);
-            Module.Add32(ref zTotalTime, AddedTime);
+            Common.Add32(ref zLastTime, AddedTime);
+            Common.Add32(ref zTotalTime, AddedTime);
 
-            Module.Add32(ref zLastBytes, AddedBytes);
-            Module.Add32(ref zTotalBytes, AddedBytes);
+            Common.Add32(ref zLastBytes, AddedBytes);
+            Common.Add32(ref zTotalBytes, AddedBytes);
         }
 
     } // <weSceqYmadY>
 
-    internal static class Module
+    internal static class Common
 	{
         private static Random cRandom = new Random();
         private static Encoding cEnc = Encoding.GetEncoding("iso-8859-1");       
@@ -665,7 +669,7 @@ internal static string MostFrequent(IEnumerator inp)
         { 
             Dictionary<string, int> cCount = new Dictionary<string, int>();
 
-            foreach (string line in Module.EnumStr(inp))
+            foreach (string line in Common.EnumStr(inp))
             {
                 if (cCount.ContainsKey(line))
                 {
@@ -693,13 +697,13 @@ internal static string RandomString(int lLength)
 
             for (int i = 0; i < lLength; i++) 
             {
-                if (Module.Random.Next(0, 2) == 1)
+                if (Common.Random.Next(0, 2) == 1)
                 {
-                    sB.Append((char)(Module.Random.Next(65, 90)));
+                    sB.Append((char)(Common.Random.Next(65, 90)));
                 }
                 else
                 {
-                    sB.Append((char)(Module.Random.Next(97, 122)));
+                    sB.Append((char)(Common.Random.Next(97, 122)));
                 }
             }
 
@@ -772,7 +776,7 @@ internal static string XmlToString(VirtualItem vi)
 
         internal static XmlWriter CreateWriter(StringBuilder sX)
         {
-            XmlWriter xR = XmlWriter.Create(sX, Module.WriterSettings);
+            XmlWriter xR = XmlWriter.Create(sX, Common.WriterSettings);
             xR.WriteProcessingInstruction("xml", "version='1.0' encoding='ISO-8859-1'");
             return xR;
         }
diff --git a/Phuse/Socket.cs b/src/Utils/Socket.cs
similarity index 97%
rename from Phuse/Socket.cs
rename to src/Utils/Socket.cs
index d3fca8a..4a486cd 100644
--- a/Phuse/Socket.cs
+++ b/src/Utils/Socket.cs
@@ -3,8 +3,8 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Diagnostics;
-using System.Security.Cryptography.X509Certificates;
 using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 
 //-------------------------------------------------------------
 //
@@ -17,7 +17,10 @@
 //
 //-------------------------------------------------------------
 
-namespace Phuse
+using Fusenet.API;
+using Fusenet.Core;
+
+namespace Fusenet.Utils
 {
     internal interface VirtualSocket
     {
@@ -114,7 +117,7 @@ private void iConnect_Completed(object sender, System.Net.Sockets.SocketAsyncEve
 
                 if (e.SocketError != SocketError.Success)
                 {
-                    NNTPError zErr = Module.TranslateError(e.SocketError);
+                    NNTPError zErr = Common.TranslateError(e.SocketError);
                     Close(zErr.Code, zErr.Message);
                     return;
                 }
@@ -194,7 +197,7 @@ private void iReceive_Completed(object sender, System.Net.Sockets.SocketAsyncEve
 			{
 				if (e.SocketError != SocketError.Success)
 				{
-                    NNTPError zErr = Module.TranslateError(e.SocketError);
+                    NNTPError zErr = Common.TranslateError(e.SocketError);
 					Close(zErr.Code, zErr.Message);
 					return;
 				}
@@ -253,7 +256,7 @@ private bool InternalSend(Stream bData)
                 iSend = new System.Net.Sockets.SocketAsyncEventArgs();
                 iSend.Completed += new EventHandler<SocketAsyncEventArgs>(iSend_Completed);
 
-                byte[] bD = Module.GetBytes(bData);
+                byte[] bD = Common.GetBytes(bData);
 				iSend.SetBuffer(bD, 0, bD.Length);
 
 				if (!ClientSocket.SendAsync(iSend)) { iSend_Completed(null, iSend); }
@@ -283,7 +286,7 @@ private void iSend_Completed(object sender, System.Net.Sockets.SocketAsyncEventA
 			{
 				if (e.SocketError != SocketError.Success)
 				{
-                    NNTPError zErr = Module.TranslateError(e.SocketError);
+                    NNTPError zErr = Common.TranslateError(e.SocketError);
 					Close(zErr.Code, zErr.Message);
 					return;
 				}
@@ -518,7 +521,7 @@ private bool InternalSend(Stream bData)
         {
             try
             {
-                byte[] bD = Module.GetBytes(bData);
+                byte[] bD = Common.GetBytes(bData);
                 SocketStream.Write(bD, 0, bD.Length);
 
                 return true;