diff --git a/Config/SettingsProvider.cs b/Config/SettingsProvider.cs
index 8dc7afc..0eb629d 100644
--- a/Config/SettingsProvider.cs
+++ b/Config/SettingsProvider.cs
@@ -25,7 +25,7 @@ public static class SettingsProvider
                 ConfigManager.Instance.Values = JsonConvert.DeserializeObject<ConfigValues>(JsonConvert.SerializeObject(model));
                 ConfigManager.Instance.Save();
 
-                Target.All.SendPackageTo(new Package(PackageType.MetaResponse, new ServerMetaResponsePackageContent {
+                Target.All.SendPackage(new Package(PackageType.MetaResponse, new ServerMetaResponsePackageContent {
                     GuestsAllowed = ConfigManager.Instance.Values.GuestsAllowed,
                     Name = ConfigManager.Instance.Values.ServerName,
                     RegistrationAllowed = ConfigManager.Instance.Values.RegistrationAllowed
diff --git a/Extensibility/Events/ConnectEventArgs.cs b/Extensibility/Events/ConnectEventArgs.cs
index 88cc36a..334674f 100644
--- a/Extensibility/Events/ConnectEventArgs.cs
+++ b/Extensibility/Events/ConnectEventArgs.cs
@@ -3,12 +3,20 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for the <see cref="EventType.Connected"/> event.
+    ///     Provides the data for the <see cref="EventType.Connected"/> event.
     /// </summary>
     public class ConnectEventArgs
     {
+        /// <summary>
+        ///     The <see cref="Networking.Client"/> connecting.
+        /// </summary>
         public Client Client { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="ConnectEventArgs"/> class.
+        /// </summary>
+        /// <param name="client"> The <see cref="Networking.Client"/> connecting.</param>
         public ConnectEventArgs(Client client) {
             this.Client = client;
         }
diff --git a/Extensibility/Events/CreateElementEventArgs.cs b/Extensibility/Events/CreateElementEventArgs.cs
index 09ada5f..d180edf 100644
--- a/Extensibility/Events/CreateElementEventArgs.cs
+++ b/Extensibility/Events/CreateElementEventArgs.cs
@@ -3,14 +3,27 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for all create events.
+    ///     Provides the data for all create events.
     /// </summary>
     /// <typeparam name="TElement">A creatable element.</typeparam>
     public class CreateElementEventArgs<TElement> : ICancellableEvent
     {
+        /// <summary>
+        ///     The <see cref="User"/> creating the <see cref="TElement"/>.
+        /// </summary>
         public User Creator { get; }
+
+        /// <summary>
+        ///     The element created by the <see cref="User"/>.
+        /// </summary>
         public TElement Element { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="CreateElementEventArgs{TElement}"/> class.
+        /// </summary>
+        /// <param name="creator">The <see cref="User"/> creating the <see cref="TElement"/>.</param>
+        /// <param name="element">The element created by the <see cref="User"/>.</param>
         public CreateElementEventArgs(User creator, TElement element) {
             this.Creator = creator;
             this.Element = element;
diff --git a/Extensibility/Events/CustomEventArgs.cs b/Extensibility/Events/CustomEventArgs.cs
index 5b88801..baecd0b 100644
--- a/Extensibility/Events/CustomEventArgs.cs
+++ b/Extensibility/Events/CustomEventArgs.cs
@@ -1,11 +1,29 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for the <see cref="EventType.Custom"/> event.
+    ///     Provides the data for the <see cref="EventType.Custom"/> event.
     /// </summary>
     public class CustomEventArgs
     {
-        // TODO
+        /// <summary>
+        ///     The name of this <see cref="CustomEventArgs"/>.
+        /// </summary>
         public string Name { get; }
+
+        /// <summary>
+        ///     The content of this <see cref="CustomEventArgs"/>.
+        /// </summary>
+        public object[] Content { get; }
+
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="CustomEventArgs"/> class.
+        /// </summary>
+        /// <param name="name">The name of this <see cref="CustomEventArgs"/>.</param>
+        /// <param name="content">The content of this <see cref="CustomEventArgs"/>.</param>
+        public CustomEventArgs(string name, params object[] content) {
+            this.Name = name;
+            this.Content = content;
+        }
     }
 }
diff --git a/Extensibility/Events/DisconnectEventArgs.cs b/Extensibility/Events/DisconnectEventArgs.cs
index 0f964fd..1420639 100644
--- a/Extensibility/Events/DisconnectEventArgs.cs
+++ b/Extensibility/Events/DisconnectEventArgs.cs
@@ -3,15 +3,38 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for the <see cref="EventType.Disconnected"/> event.
+    ///     Provides the data for the <see cref="EventType.Disconnected"/> event.
     /// </summary>
     public class DisconnectEventArgs
     {
+        /// <summary>
+        ///     The <see cref="Client"/> disconnecting.
+        /// </summary>
         public Client Client { get; }
+
+        /// <summary>
+        ///     The code of the disconnect provided by the socket.
+        /// </summary>
         public ushort Code { get; }
+
+        /// <summary>
+        ///     The reason of the disconnect provided by the socket.
+        /// </summary>
         public string Reason { get; }
+
+        /// <summary>
+        ///     Determines whether the disconnect was clean.
+        /// </summary>
         public bool WasClean { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="DisconnectEventArgs"/> class.
+        /// </summary>
+        /// <param name="client">The <see cref="Client"/> disconnecting.</param>
+        /// <param name="code">The code of the disconnect provided by the socket.</param>
+        /// <param name="reason">The reason of the disconnect provided by the socket.</param>
+        /// <param name="wasClean">Whether the disconnect was clean.</param>
         public DisconnectEventArgs(Client client, ushort code, string reason, bool wasClean) {
             this.Client = client;
             this.Code = code;
diff --git a/Extensibility/Events/EditElementEventArgs.cs b/Extensibility/Events/EditElementEventArgs.cs
index e72a11f..c9ca2cc 100644
--- a/Extensibility/Events/EditElementEventArgs.cs
+++ b/Extensibility/Events/EditElementEventArgs.cs
@@ -3,14 +3,27 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for all edit events.
+    ///     Provides the data for all edit events.
     /// </summary>
     /// <typeparam name="TElement">An editable element.</typeparam>
     public class EditElementEventArgs<TElement> : ICancellableEvent
     {
+        /// <summary>
+        ///     The <see cref="User"/> editing the <see cref="TElement"/>.
+        /// </summary>
         public User Editor { get; }
+
+        /// <summary>
+        ///     The element the <see cref="User"/> edited.
+        /// </summary>
         public TElement Element { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="EditElementEventArgs{TElement}"/> class.
+        /// </summary>
+        /// <param name="editor">The <see cref="User"/> editing the <see cref="TElement"/>.</param>
+        /// <param name="element">The element the <see cref="User"/> edited.</param>
         public EditElementEventArgs(User editor, TElement element) {
             this.Editor = editor;
             this.Element = element;
diff --git a/Extensibility/Events/EventType.cs b/Extensibility/Events/EventType.cs
index 41b6b61..d582476 100644
--- a/Extensibility/Events/EventType.cs
+++ b/Extensibility/Events/EventType.cs
@@ -1,4 +1,5 @@
-using Neo.Core.Communication;
+using System;
+using Neo.Core.Communication;
 using Neo.Core.Networking;
 using Neo.Core.Shared;
 
@@ -157,6 +158,7 @@ public enum EventType
         /// <summary>
         ///     This event is raised when a <see cref="User"/> is typing.
         /// </summary>
+        [Obsolete]
         Typing,
 
         /// <summary>
diff --git a/Extensibility/Events/InputEventArgs.cs b/Extensibility/Events/InputEventArgs.cs
index 888d60b..b923482 100644
--- a/Extensibility/Events/InputEventArgs.cs
+++ b/Extensibility/Events/InputEventArgs.cs
@@ -2,11 +2,27 @@
 
 namespace Neo.Core.Extensibility.Events
 {
+    /// <summary>
+    ///     Provides the data for the <see cref="EventType.Input"/> event.
+    /// </summary>
     public class InputEventArgs : ICancellableEvent
     {
+        /// <summary>
+        ///     The sender of the input.
+        /// </summary>
         public User Sender { get; }
+
+        /// <summary>
+        ///     The input sent.
+        /// </summary>
         public string Input { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="InputEventArgs"/> class.
+        /// </summary>
+        /// <param name="sender">The sender of the input.</param>
+        /// <param name="input">The input sent.</param>
         public InputEventArgs(User sender, string input) {
             this.Sender = sender;
             this.Input = input;
diff --git a/Extensibility/Events/JoinElementEventArgs.cs b/Extensibility/Events/JoinElementEventArgs.cs
index 28d860c..4f91cec 100644
--- a/Extensibility/Events/JoinElementEventArgs.cs
+++ b/Extensibility/Events/JoinElementEventArgs.cs
@@ -3,14 +3,27 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for all join events.
+    ///     Provides the data for all join events.
     /// </summary>
     /// <typeparam name="TElement">A joinable element.</typeparam>
     public class JoinElementEventArgs<TElement> : ICancellableEvent
     {
+        /// <summary>
+        ///     The <see cref="User"/> joining the <see cref="TElement"/>.
+        /// </summary>
         public User Joiner { get; }
+
+        /// <summary>
+        ///     The element the <see cref="User"/> joined.
+        /// </summary>
         public TElement Element { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="JoinElementEventArgs{TElement}"/> class.
+        /// </summary>
+        /// <param name="joiner">The <see cref="User"/> joining the <see cref="TElement"/>.</param>
+        /// <param name="element">The element the <see cref="User"/> joined.</param>
         public JoinElementEventArgs(User joiner, TElement element) {
             this.Joiner = joiner;
             this.Element = element;
diff --git a/Extensibility/Events/LeaveElementEventArgs.cs b/Extensibility/Events/LeaveElementEventArgs.cs
index 6fc43f5..ce3738b 100644
--- a/Extensibility/Events/LeaveElementEventArgs.cs
+++ b/Extensibility/Events/LeaveElementEventArgs.cs
@@ -3,14 +3,27 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for all leave events.
+    ///     Provides the data for all leave events.
     /// </summary>
     /// <typeparam name="TElement">A leavable element.</typeparam>
     public class LeaveElementEventArgs<TElement> : ICancellableEvent
     {
+        /// <summary>
+        ///     The <see cref="User"/> leaving the <see cref="TElement"/>.
+        /// </summary>
         public User Leaver { get; }
+
+        /// <summary>
+        ///     The element the <see cref="User"/> left.
+        /// </summary>
         public TElement Element { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="LeaveElementEventArgs{TElement}"/> class.
+        /// </summary>
+        /// <param name="leaver">The <see cref="User"/> leaving the <see cref="TElement"/>.</param>
+        /// <param name="element">The element the <see cref="User"/> left.</param>
         public LeaveElementEventArgs(User leaver, TElement element) {
             this.Leaver = leaver;
             this.Element = element;
diff --git a/Extensibility/Events/ReceiveElementEventArgs.cs b/Extensibility/Events/ReceiveElementEventArgs.cs
index fcbea57..f8e9c39 100644
--- a/Extensibility/Events/ReceiveElementEventArgs.cs
+++ b/Extensibility/Events/ReceiveElementEventArgs.cs
@@ -3,15 +3,27 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for all receive events.
+    ///     Provides the data for all receive events.
     /// </summary>
     /// <typeparam name="TElement">A receivable element.</typeparam>
     public class ReceiveElementEventArgs<TElement> : ICancellableEvent
     {
-        // TODO
+        /// <summary>
+        ///     The sender of the <see cref="TElement"/>.
+        /// </summary>
         public Client Sender { get; }
+
+        /// <summary>
+        ///     The element received.
+        /// </summary>
         public TElement Element { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="ReceiveElementEventArgs{TElement}"/> class.
+        /// </summary>
+        /// <param name="sender">The sender of the <see cref="TElement"/>.</param>
+        /// <param name="element">The received element.</param>
         public ReceiveElementEventArgs(Client sender, TElement element) {
             this.Sender = sender;
             this.Element = element;
diff --git a/Extensibility/Events/RemoveElementEventArgs.cs b/Extensibility/Events/RemoveElementEventArgs.cs
index d93e4f7..e5519d7 100644
--- a/Extensibility/Events/RemoveElementEventArgs.cs
+++ b/Extensibility/Events/RemoveElementEventArgs.cs
@@ -3,14 +3,27 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for all remove events.
+    ///     Provides the data for all remove events.
     /// </summary>
     /// <typeparam name="TElement">A removable element.</typeparam>
     public class RemoveElementEventArgs<TElement> : ICancellableEvent
     {
+        /// <summary>
+        ///     The <see cref="User"/> removing the <see cref="TElement"/>.
+        /// </summary>
         public User Remover { get; }
+
+        /// <summary>
+        ///     The element to remove.
+        /// </summary>
         public TElement Element { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="RemoveElementEventArgs{TElement}"/> class.
+        /// </summary>
+        /// <param name="remover">The <see cref="User"/> removing the <see cref="TElement"/>.</param>
+        /// <param name="element">The element to remove.</param>
         public RemoveElementEventArgs(User remover, TElement element) {
             this.Remover = remover;
             this.Element = element;
diff --git a/Extensibility/Events/TypingEventArgs.cs b/Extensibility/Events/TypingEventArgs.cs
index 9e1c2c2..0f9efe3 100644
--- a/Extensibility/Events/TypingEventArgs.cs
+++ b/Extensibility/Events/TypingEventArgs.cs
@@ -4,15 +4,33 @@
 namespace Neo.Core.Extensibility.Events
 {
     /// <summary>
-    ///     Provides data for the <see cref="EventType.Typing"/> event.
+    ///     Provides the data for the <see cref="EventType.Typing"/> event.
     /// </summary>
     [Obsolete]
     public class TypingEventArgs
     {
+        /// <summary>
+        ///     The <see cref="Shared.User"/> typing. 
+        /// </summary>
         public User User { get; }
+
+        /// <summary>
+        ///     The <see cref="Channel"/> in which this <see cref="TypingEventArgs"/> was invoked.
+        /// </summary>
         public Channel Channel { get; }
+
+        /// <summary>
+        ///     The input of the <see cref="Shared.User"/> so far.
+        /// </summary>
         public string CurrentInput { get; }
 
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="TypingEventArgs"/> class.
+        /// </summary>
+        /// <param name="user">The <see cref="Shared.User"/> typing.</param>
+        /// <param name="channel">The <see cref="Channel"/> in which this <see cref="TypingEventArgs"/> was invoked.</param>
+        /// <param name="currentInput">The input of the <see cref="Shared.User"/> so far.</param>
         public TypingEventArgs(User user, Channel channel, string currentInput) {
             this.User = user;
             this.Channel = channel;
diff --git a/Extensibility/Listener.cs b/Extensibility/Listener.cs
index 5795524..3aac4b7 100644
--- a/Extensibility/Listener.cs
+++ b/Extensibility/Listener.cs
@@ -2,12 +2,26 @@
 
 namespace Neo.Core.Extensibility
 {
-    // TODO: Add docs
+    /// <summary>
+    ///     Represents an event listener of a <see cref="Extensibility.Plugin"/>.
+    /// </summary>
     public class Listener
     {
+        /// <summary>
+        ///     The handler to execute.
+        /// </summary>
         public MethodInfo Method { get; }
+
+        /// <summary>
+        ///     The <see cref="Plugin"/> this <see cref="Listener"/> belongs to.
+        /// </summary>
         public Plugin Plugin { get; }
 
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="Listener"/> class.
+        /// </summary>
+        /// <param name="method">The handler to execute.</param>
+        /// <param name="plugin">The <see cref="Plugin"/> this <see cref="Listener"/> belongs to.</param>
         public Listener(MethodInfo method, Plugin plugin) {
             this.Method = method;
             this.Plugin = plugin;
diff --git a/Extensibility/Plugin.cs b/Extensibility/Plugin.cs
index a519ab2..b0b1731 100644
--- a/Extensibility/Plugin.cs
+++ b/Extensibility/Plugin.cs
@@ -10,12 +10,22 @@
 
 namespace Neo.Core.Extensibility
 {
-    // TODO: Add docs
+    /// <summary>
+    ///     Represents the base class for an extensible component.
+    /// </summary>
     public abstract class Plugin
     {
+        /// <summary>
+        ///     The unique id used to identify this <see cref="Plugin"/>.
+        /// </summary>
         public Guid InternalId { get; } = Guid.NewGuid();
+
+        /// <summary>
+        ///     The namespace of this <see cref="Plugin"/>.
+        /// </summary>
         public abstract string Namespace { get; }
 
+
         public virtual async Task OnInitialize() { }
 
         public virtual async Task OnCustom(CustomEventArgs args) { }
@@ -61,6 +71,7 @@ public abstract class Plugin
         public virtual async Task OnBeforeGroupRemove(Before<RemoveElementEventArgs<Group>> args) { }
         public virtual async Task OnGroupRemoved(RemoveElementEventArgs<Group> args) { }
 
+        [Obsolete]
         public virtual async Task OnTyping(TypingEventArgs args) { }
 
         public virtual async Task OnBeforeInput(Before<InputEventArgs> args) { }
diff --git a/Extensibility/PluginLoader.cs b/Extensibility/PluginLoader.cs
index 1ef1350..fe86f52 100644
--- a/Extensibility/PluginLoader.cs
+++ b/Extensibility/PluginLoader.cs
@@ -3,16 +3,24 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 
 namespace Neo.Core.Extensibility
 {
-    // TODO: Add docs
+    /// <summary>
+    ///     Provides methods to load <see cref="Plugin"/>s.
+    /// </summary>
     public static class PluginLoader
     {
+        /// <summary>
+        ///     Contains all loaded <see cref="Plugin"/>s.
+        /// </summary>
         public static List<Plugin> Plugins { get; } = new List<Plugin>();
 
-        public static async Task InitializePlugin(string path) {
+        /// <summary>
+        ///     Loads and initializes a <see cref="Plugin"/>.
+        /// </summary>
+        /// <param name="path">The path to the <see cref="Plugin"/>.</param>
+        public static void InitializePlugin(string path) {
             if (File.Exists(path) && new FileInfo(path).Extension == ".dll") {
                 Assembly.LoadFile(path);
                 var assemblyTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes()).Where(t => typeof(Plugin).IsAssignableFrom(t) && t.IsClass).ToArray();
@@ -24,14 +32,14 @@ public static class PluginLoader
 
                     var plugin = (Plugin) Activator.CreateInstance(type);
                     
-                    if (Plugins.Any(p => p.Namespace == plugin.Namespace)) {
+                    if (Plugins.Any(_ => _.Namespace == plugin.Namespace)) {
                         plugin = null;
                         continue;
                     }
 
                     EventService.RegisterListeners(type, plugin);
 
-                    await plugin.OnInitialize();
+                    plugin.OnInitialize();
 
                     Plugins.Add(plugin);
                 }
diff --git a/Management/ChannelManager.cs b/Management/ChannelManager.cs
index bcafcf1..2a1555e 100644
--- a/Management/ChannelManager.cs
+++ b/Management/ChannelManager.cs
@@ -5,7 +5,6 @@
 using Neo.Core.Communication;
 using Neo.Core.Communication.Packages;
 using Neo.Core.Config;
-using Neo.Core.Database;
 using Neo.Core.Extensibility;
 using Neo.Core.Networking;
 using Neo.Core.Shared;
@@ -14,13 +13,21 @@
 
 namespace Neo.Core.Management
 {
+    /// <summary>
+    ///     Provides methods to manage <see cref="Channel"/>s.
+    /// </summary>
     public static class ChannelManager
     {
+        /// <summary>
+        ///     Adds a <see cref="User"/> to a <see cref="Channel"/> and informs all other channel members.
+        /// </summary>
+        /// <param name="user">The <see cref="User"/> to add.</param>
+        /// <param name="channel">The <see cref="Channel"/> to add the <see cref="User"/> to.</param>
         private static void AddUserToChannel(User user, Channel channel) {
             channel.MemberIds.Add(user.InternalId);
             
             var message = MessagePackageContent.GetSystemMessage(user.Identity.Name + " ist dem Channel beigetreten.", channel.InternalId);
-            Pool.Server.SendPackageTo(new Target().AddMany(channel), new Package(PackageType.Message, message));
+            new Target().AddMany(channel).SendPackage(new Package(PackageType.Message, message));
 
             if (ConfigManager.Instance.Values.SaveSystemMessages) {
                 channel.SaveMessage(message);
@@ -29,6 +36,7 @@ public static class ChannelManager
             RefreshChannels();
         }
 
+        [Obsolete]
         public static void CloseChannel(User user) {
             if (user.ActiveChannel != null) {
                 var channel = user.ActiveChannel;
@@ -37,20 +45,36 @@ public static class ChannelManager
             }
         }
 
+        /// <summary>
+        ///     Creates a new <see cref="Channel"/> for a <see cref="Plugin"/>.
+        /// </summary>
+        /// <param name="plugin">The <see cref="Plugin"/> that creates the <see cref="Channel"/>.</param>
+        /// <param name="member">The <see cref="Member"/> that owns the <see cref="Channel"/>.</param>
+        /// <param name="channel">The <see cref="Channel"/> to create.</param>
+        /// <returns>Returns <c>false</c> if a channel with the given id already exists. Otherwise <c>true</c>.</returns>
         public static bool CreateChannel(this Plugin plugin, Member member, Channel channel) {
-            if (Pool.Server.Channels.Any(c => c.Id == channel.Id)) {
+            if (Pool.Server.Channels.Any(_ => _.Id == channel.Id)) {
                 return false;
             }
 
             channel.Attributes.Add("neo.origin", plugin.InternalId);
             channel.Owner = member.InternalId;
+            
+            // TODO: Maybe add the channel to the server list?
+
             AddUserToChannel(member, channel);
 
             return true;
         }
 
+        /// <summary>
+        ///     Creates a new <see cref="Channel"/> for a <see cref="User"/>.
+        /// </summary>
+        /// <param name="user">The <see cref="User"/> who creates the <see cref="Channel"/>.</param>
+        /// <param name="channel">The <see cref="Channel"/> to create.</param>
+        /// <returns>Returns <c>false</c> if a channel with the given id already exists or the user is not authorized to create channels. Otherwise <c>true</c>.</returns>
         public static bool CreateChannel(this User user, Channel channel) {
-            if (Pool.Server.Channels.Any(c => c.Id == channel.Id)) {
+            if (Pool.Server.Channels.Any(_ => _.Id == channel.Id)) {
                 return false;
             }
             
@@ -70,8 +94,13 @@ public static class ChannelManager
             return true;
         }
 
+        /// <summary>
+        ///     Deletes a <see cref="Channel"/> for a <see cref="User"/>.
+        /// </summary>
+        /// <param name="channel">The <see cref="Channel"/> to delete.</param>
+        /// <param name="user">The <see cref="User"/> who deletes the <see cref="Channel"/>.</param>
+        /// <returns>Returns <c>false</c> if the user is not authorized to delete channels. Otherwise <c>true</c>.</returns>
         public static bool DeleteChannel(this Channel channel, User user) {
-
             if (!user.IsAuthorized("neo.channel.delete")) {
                 return false;
             }
@@ -82,25 +111,30 @@ public static class ChannelManager
             return true;
         }
 
+        /// <summary>
+        ///     Returns the default <see cref="Channel"/>.
+        /// </summary>
+        /// <returns>Returns the default <see cref="Channel"/>.</returns>
         public static Channel GetMainChannel() {
-            return Pool.Server.Channels.Find(c => c.Attributes.ContainsKey("neo.channeltype") && c.Attributes["neo.channeltype"].ToString() == "main");
+            return Pool.Server.Channels.Find(_ => _.Attributes.ContainsKey("neo.channeltype") && _.Attributes["neo.channeltype"].ToString() == "main");
         }
 
+        // TODO: Add docs
         public static ChannelActionResult JoinChannel(this User user, Channel channel, string password = "") {
             if (!user.IsAuthorized("neo.channel.join.$")) {
                 return ChannelActionResult.NotAllowed;
             }
 
-            if (channel.BlacklistedGroupIds.Count > 0 || channel.BlacklistedUserIds.Count > 0) {
-                if (user is Member member && channel.BlacklistedGroupIds.Any(member.Groups.Select(g => g.InternalId).Contains) || channel.BlacklistedUserIds.Contains(user.InternalId)) {
-                    if (user.IsAuthorized("neo.channel.join.ignoreblacklist")) {
-                        AddUserToChannel(user, channel);
-                        return ChannelActionResult.Success;
-                    }
+            //if (channel.BlacklistedGroupIds.Count > 0 || channel.BlacklistedUserIds.Count > 0) {
+            //    if (user is Member member && channel.BlacklistedGroupIds.Any(member.Groups.Select(g => g.InternalId).Contains) || channel.BlacklistedUserIds.Contains(user.InternalId)) {
+            //        if (user.IsAuthorized("neo.channel.join.ignoreblacklist")) {
+            //            AddUserToChannel(user, channel);
+            //            return ChannelActionResult.Success;
+            //        }
 
-                    return ChannelActionResult.Blacklisted;
-                }
-            }
+            //        return ChannelActionResult.Blacklisted;
+            //    }
+            //}
 
             if (!string.IsNullOrEmpty(channel.Password) && channel.Password != password) {
                 if (user.IsAuthorized("neo.channel.join.ignorepassword")) {
@@ -120,27 +154,33 @@ public static class ChannelManager
                 return ChannelActionResult.Full;
             }
 
-            if (channel.WhitelistedGroupIds.Count > 0 || channel.WhitelistedUserIds.Count > 0) {
-                if (user is Member member && !channel.WhitelistedGroupIds.Any(member.Groups.Select(g => g.InternalId).Contains) || !channel.WhitelistedUserIds.Contains(user.InternalId)) {
-                    if (user.IsAuthorized("neo.channel.join.ignorewhitelist")) {
-                        AddUserToChannel(user, channel);
-                        return ChannelActionResult.Success;
-                    }
+            //if (channel.WhitelistedGroupIds.Count > 0 || channel.WhitelistedUserIds.Count > 0) {
+            //    if (user is Member member && !channel.WhitelistedGroupIds.Any(member.Groups.Select(g => g.InternalId).Contains) || !channel.WhitelistedUserIds.Contains(user.InternalId)) {
+            //        if (user.IsAuthorized("neo.channel.join.ignorewhitelist")) {
+            //            AddUserToChannel(user, channel);
+            //            return ChannelActionResult.Success;
+            //        }
 
-                    return ChannelActionResult.NotWhitelisted;
-                }
-            }
+            //        return ChannelActionResult.NotWhitelisted;
+            //    }
+            //}
 
             AddUserToChannel(user, channel);
             return ChannelActionResult.Success;
         }
 
+        // TODO: Add docs
         public static void LeaveChannel(this User user, Channel channel) {
             channel.ActiveMemberIds.Remove(user.InternalId);
             channel.MemberIds.Remove(user.InternalId);
             RefreshChannels();
         }
 
+        /// <summary>
+        ///     Moves a <see cref="User"/> to a <see cref="Channel"/>, effectively setting the channel to the users active channel.
+        /// </summary>
+        /// <param name="user">The <see cref="User"/> to move.</param>
+        /// <param name="channel">The <see cref="Channel"/> to move the <see cref="User"/> to.</param>
         public static void MoveToChannel(this User user, Channel channel) {
             if (!channel.ActiveMemberIds.Contains(user.InternalId)) {
                 var currentActiveChannel = user.ActiveChannel;
@@ -152,11 +192,17 @@ public static class ChannelManager
                 channel.ActiveMemberIds.Add(user.InternalId);
                 RefreshChannels();
                 
-                
-                user.ToTarget().SendPackageTo(new Package(PackageType.EnterChannelResponse, new EnterChannelResponsePackageContent(ChannelActionResult.Success, channel)));
+                user.ToTarget().SendPackage(new Package(PackageType.EnterChannelResponse, new EnterChannelResponsePackageContent(ChannelActionResult.Success, channel)));
             }
         }
 
+        /// <summary>
+        ///     Opens a <see cref="Channel"/> for a <see cref="User"/>. Performs a join if the user is not member of the channel already and then moves the user into the channel.
+        /// </summary>
+        /// <param name="user">The <see cref="User"/> to open the <see cref="Channel"/> for.</param>
+        /// <param name="channel">The <see cref="Channel"/> to open for the <see cref="User"/>.</param>
+        /// <param name="password">The password entered by the client.</param>
+        /// <returns></returns>
         public static ChannelActionResult OpenChannel(this User user, Channel channel, string password = "") {
             if (!channel.MemberIds.Contains(user.InternalId)) {
                 var result = JoinChannel(user, channel, password);
@@ -169,13 +215,20 @@ public static class ChannelManager
             return ChannelActionResult.Success;
         }
 
+        /// <summary>
+        ///     Updates the list of <see cref="Channel"/>s for each connected <see cref="User"/>.
+        /// </summary>
         public static void RefreshChannels() {
             var channels = JsonConvert.DeserializeObject<List<Channel>>(JsonConvert.SerializeObject(Pool.Server.Channels));
-            channels.ForEach(c => c.Password = !string.IsNullOrEmpty(c.Password) ? "true" : null);
+            channels.ForEach(_ => _.Password = !string.IsNullOrEmpty(_.Password) ? "true" : null);
 
-            Pool.Server.SendPackageTo(Target.All, new Package(PackageType.ChannelListUpdate, channels));
+            Target.All.SendPackage(new Package(PackageType.ChannelListUpdate, channels));
         }
 
+        /// <summary>
+        ///     Removes a <see cref="Channel"/> and moves all remaining members to the default channel.
+        /// </summary>
+        /// <param name="channel">The <see cref="Channel"/> to remove.</param>
         public static void RemoveChannel(Channel channel) {
             foreach (var activeMember in channel.ActiveMembers) {
                 MoveToChannel(activeMember, GetMainChannel());
@@ -186,6 +239,7 @@ public static class ChannelManager
         }
     }
 
+    // TODO: Add docs
     [JsonConverter(typeof(StringEnumConverter))]
     public enum ChannelActionResult
     {
diff --git a/Management/GroupManager.cs b/Management/GroupManager.cs
index fd2f553..7765797 100644
--- a/Management/GroupManager.cs
+++ b/Management/GroupManager.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using Neo.Core.Authorization;
 using Neo.Core.Communication;
 using Neo.Core.Networking;
@@ -9,25 +8,40 @@
 
 namespace Neo.Core.Management
 {
+    /// <summary>
+    ///     Provides methods to manage <see cref="Group"/>s.
+    /// </summary>
     public static class GroupManager
     {
+        /// <summary>
+        ///     Adds a <see cref="Guest"/> to the guest <see cref="Group"/>.
+        /// </summary>
+        /// <param name="guest">The <see cref="Guest"/> to add.</param>
         public static void AddGuestToGroup(Guest guest) {
             GetGuestGroup().MemberIds.Add(guest.InternalId);
+
             RefreshGroups();
         }
 
+        /// <summary>
+        ///     Adds a <see cref="Member"/> to a <see cref="Channel"/>.
+        /// </summary>
+        /// <param name="member">The <see cref="Member"/> to add.</param>
+        /// <param name="group">The <see cref="Group"/> to add the <see cref="Member"/> to.</param>
         public static void AddMemberToGroup(Member member, Group group) {
             group.MemberIds.Add(member.InternalId);
             Pool.Server.DataProvider.Save();
+
             RefreshGroups();
         }
 
+        // TODO: Add docs
         public static GroupActionResult CreateGroup(Group group, User creator) {
             if (!creator.IsAuthorized("neo.group.create")) {
                 return GroupActionResult.NotAllowed;
             }
 
-            if (Pool.Server.Groups.Any(g => g.Id == group.Id)) {
+            if (Pool.Server.Groups.Any(_ => _.Id == group.Id)) {
                 return GroupActionResult.IdInUse;
             }
             
@@ -37,18 +51,19 @@ public static class GroupManager
             return GroupActionResult.Success;
         }
 
+        // TODO: Add docs
         public static GroupActionResult DeleteGroup(Group group, User deletor) {
             if (!deletor.IsAuthorized("neo.group.delete")) {
                 return GroupActionResult.NotAllowed;
             }
 
-            var members = group.Members.Select(a => a.InternalId);
+            var members = group.Members.Select(_ => _.InternalId);
 
             Pool.Server.Groups.Remove(group);
 
-            members.Select(m => Pool.Server.Accounts.Find(a => a.InternalId == m)).ToList().ForEach(a => {
-                if (a.Groups.Count == 0) {
-                    GetUserGroup().MemberIds.Add(a.InternalId);
+            members.Select(member => Pool.Server.Accounts.Find(account => account.InternalId == member)).ToList().ForEach(account => {
+                if (account.Groups.Count == 0) {
+                    GetUserGroup().MemberIds.Add(account.InternalId);
                 }
             });
 
@@ -57,38 +72,63 @@ public static class GroupManager
             return GroupActionResult.Success;
         }
 
+        /// <summary>
+        ///     Returns the admin <see cref="Group"/>.
+        /// </summary>
+        /// <returns>Returns the admin <see cref="Group"/>.</returns>
         public static Group GetAdminGroup() {
-            return Pool.Server.Groups.Find(g => g.Attributes.ContainsKey("neo.grouptype") && g.Attributes["neo.grouptype"].ToString() == "admin");
+            return Pool.Server.Groups.Find(_ => _.Attributes.ContainsKey("neo.grouptype") && _.Attributes["neo.grouptype"].ToString() == "admin");
         }
 
+        /// <summary>
+        ///     Returns the guest <see cref="Group"/>.
+        /// </summary>
+        /// <returns>Returns the guest <see cref="Group"/>.</returns>
         public static Group GetGuestGroup() {
-            return Pool.Server.Groups.Find(g => g.Attributes.ContainsKey("neo.grouptype") && g.Attributes["neo.grouptype"].ToString() == "guest");
+            return Pool.Server.Groups.Find(_ => _.Attributes.ContainsKey("neo.grouptype") && _.Attributes["neo.grouptype"].ToString() == "guest");
         }
 
+        /// <summary>
+        ///     Returns the default <see cref="Group"/>.
+        /// </summary>
+        /// <returns>Returns the default <see cref="Group"/>.</returns>
         public static Group GetUserGroup() {
-            return Pool.Server.Groups.Find(g => g.Attributes.ContainsKey("neo.grouptype") && g.Attributes["neo.grouptype"].ToString() == "user");
+            return Pool.Server.Groups.Find(_ => _.Attributes.ContainsKey("neo.grouptype") && _.Attributes["neo.grouptype"].ToString() == "user");
         }
 
+        /// <summary>
+        ///     Updates the list of <see cref="Group"/>s for each connected <see cref="User"/>.
+        /// </summary>
         public static void RefreshGroups() {
-            Target.All.SendPackageTo(new Package(PackageType.GroupListUpdate, Pool.Server.Groups));
+            Target.All.SendPackage(new Package(PackageType.GroupListUpdate, Pool.Server.Groups));
 
-            Pool.Server.Users.ForEach(u => {
-                u.ToTarget().SendPackageTo(new Package(PackageType.GrantedPermissionsUpdate, u.GetAllPermissons()));
-            });
+            Pool.Server.Users.ForEach(_ => _.ToTarget().SendPackage(new Package(PackageType.GrantedPermissionsUpdate, _.GetAllPermissons())));
         }
 
+        /// <summary>
+        ///     Removes a <see cref="Guest"/> from the guest <see cref="Group"/>.
+        /// </summary>
+        /// <param name="guest">The <see cref="Guest"/> to remove.</param>
         public static void RemoveGuestFromGroup(Guest guest) {
             GetGuestGroup().MemberIds.Remove(guest.InternalId);
+
             RefreshGroups();
         }
 
+        /// <summary>
+        ///     Removes a <see cref="Member"/> from a <see cref="Group"/>.
+        /// </summary>
+        /// <param name="member">The <see cref="Member"/> to remove.</param>
+        /// <param name="group">The <see cref="Group"/> to remove the <see cref="Member"/> from.</param>
         public static void RemoveMemberFromGroup(Member member, Group group) {
             group.MemberIds.Remove(member.InternalId);
             Pool.Server.DataProvider.Save();
+
             RefreshGroups();
         }
     }
 
+    // TODO: Add docs
     [JsonConverter(typeof(StringEnumConverter))]
     public enum GroupActionResult
     {
diff --git a/Management/UserManager.cs b/Management/UserManager.cs
index 3dcb78a..8d71b57 100644
--- a/Management/UserManager.cs
+++ b/Management/UserManager.cs
@@ -6,21 +6,34 @@
 
 namespace Neo.Core.Management
 {
+    /// <summary>
+    ///     Provides methods to manage <see cref="User"/>s.
+    /// </summary>
     public static class UserManager
     {
+        /// <summary>
+        ///     Returns the root <see cref="Account"/>.
+        /// </summary>
+        /// <returns>Returns the root <see cref="Account"/>.</returns>
         public static Account GetRoot() {
-            return Pool.Server.Accounts.Find(g => g.Attributes.ContainsKey("neo.usertype") && g.Attributes["neo.usertype"].ToString() == "root");
+            return Pool.Server.Accounts.Find(_ => _.Attributes.ContainsKey("neo.usertype") && _.Attributes["neo.usertype"].ToString() == "root");
         }
 
+        /// <summary>
+        ///     Updates the list of <see cref="Account"/>s for each connected <see cref="User"/>.
+        /// </summary>
         public static void RefreshAccounts() {
             var accounts = JsonConvert.DeserializeObject<List<Account>>(JsonConvert.SerializeObject(Pool.Server.Accounts));
-            accounts.ForEach(a => a.Password = null);
+            accounts.ForEach(_ => _.Password = null);
 
-            Pool.Server.SendPackageTo(Target.All, new Package(PackageType.AccountListUpdate, accounts));
+            Target.All.SendPackage(new Package(PackageType.AccountListUpdate, accounts));
         }
 
+        /// <summary>
+        ///     Updates the list of <see cref="User"/>s for each connected <see cref="User"/>.
+        /// </summary>
         public static void RefreshUsers() {
-            Pool.Server.SendPackageTo(Target.All, new Package(PackageType.UserListUpdate, Pool.Server.Users));
+            Target.All.SendPackage(new Package(PackageType.UserListUpdate, Pool.Server.Users));
         }
     }
 }
diff --git a/Networking/BaseServer.cs b/Networking/BaseServer.cs
index 2032bc1..ee87fb1 100644
--- a/Networking/BaseServer.cs
+++ b/Networking/BaseServer.cs
@@ -23,10 +23,29 @@ namespace Neo.Core.Networking
     /// </summary>
     public abstract class BaseServer
     {
-        private WebSocketServer webSocketServer;
+        /// <summary>
+        ///     Contains all known <see cref="Account"/>s.
+        /// </summary>
         public List<Account> Accounts { get; set; } = new List<Account>();
+
+        /// <summary>
+        ///     Contains all known <see cref="Channel"/>s.
+        /// </summary>
         public List<Channel> Channels { get; set; } = new List<Channel>();
+
+        /// <summary>
+        ///     Contains all connected <see cref="Client"/>s.
+        /// </summary>
+        public List<Client> Clients { get; set; } = new List<Client>();
+
+        /// <summary>
+        ///     Contains all known <see cref="Group"/>s.
+        /// </summary>
         public List<Group> Groups { get; set; } = new List<Group>();
+
+        /// <summary>
+        ///     Contains all connected <see cref="User"/>s.
+        /// </summary>
         public List<User> Users { get; set; } = new List<User>();
 
         public Dictionary<string, string> KnownPermissions { get; set; } = new Dictionary<string, string> {
@@ -46,9 +65,7 @@ public abstract class BaseServer
         };
 
         public DataProvider DataProvider { get; set; }
-
-        public List<Client> Clients { get; set; } = new List<Client>();
-
+        
         // ReSharper disable once InconsistentNaming
         public RSAParameters RSAPublicParameters { get; private set; }
 
@@ -58,15 +75,37 @@ public abstract class BaseServer
 
         protected string dataPath;
 
+        private WebSocketServer webSocketServer;
+
         public abstract Task OnConnect(Client client);
         public abstract Task OnDisconnect(string clientId, ushort code, string reason, bool wasClean);
         public abstract Task OnError(string clientId, Exception ex, string message);
         public abstract Task OnPackage(string clientId, Package package);
 
+        /// <summary>
+        ///     Returns the associated <see cref="User"/> to a <see cref="Client"/>.
+        /// </summary>
+        /// <param name="client">The <see cref="Client"/> to get the <see cref="User"/> from.</param>
+        /// <returns>Returns the <see cref="User"/>.</returns>
+        protected User GetUser(Client client) {
+            return GetUser(client.ClientId);
+        }
+
+        /// <summary>
+        ///     Returns the associated <see cref="User"/> to a <see cref="Client"/>.
+        /// </summary>
+        /// <param name="clientId">The internal id of the <see cref="Client"/> to get the <see cref="User"/> from.</param>
+        /// <returns>Returns the <see cref="User"/>.</returns>
         protected User GetUser(string clientId) {
             return Users.Find(u => u.Client.ClientId == clientId);
         }
 
+        /// <summary>
+        ///     Initializes this <see cref="BaseServer"/>.
+        /// </summary>
+        /// <param name="configPath">The path to the config file.</param>
+        /// <param name="dataDirectoryPath">The path to the data directory.</param>
+        /// <param name="pluginDirectoryPath">The path to the plugins directory.</param>
         public void Initialize(string configPath, string dataDirectoryPath, string pluginDirectoryPath) {
             ConfigManager.Instance.Load(configPath);
             Pool.Server = this;
@@ -159,8 +198,9 @@ public abstract class BaseServer
                 Logger.Instance.Log(LogLevel.Debug, "No guest group existed. Default guest group created");
             }
 
-            foreach (var pluginFile in new DirectoryInfo(pluginDirectoryPath).EnumerateFiles("*.dll"))
+            foreach (var pluginFile in new DirectoryInfo(pluginDirectoryPath).EnumerateFiles("*.dll")) {
                 PluginLoader.InitializePlugin(pluginFile.FullName);
+            }
 
             EventService.RaiseEvent(EventType.ServerInitialized, this);
         }
@@ -171,8 +211,9 @@ public abstract class BaseServer
         /// <param name="target">The recipients of the <see cref="Package" />.</param>
         /// <param name="package">The <see cref="Package" /> to send.</param>
         public void SendPackageTo(Target target, Package package) {
-            foreach (var client in Clients.FindAll(c => target.Targets.Contains(c.ClientId)))
+            foreach (var client in Clients.FindAll(c => target.Targets.Contains(c.ClientId))) {
                 client.SendPackage(package);
+            }
         }
 
         /// <summary>
@@ -196,9 +237,11 @@ public abstract class BaseServer
             //Logger.Instance.Log(LogLevel.Ok, "RSA key pair successfully generated");
 
             Logger.Instance.Log(LogLevel.Info, $"Attempting to start WebSocket server on ws://{ConfigManager.Instance.Values.ServerAddress}:{ConfigManager.Instance.Values.ServerPort}...");
+
             webSocketServer = new WebSocketServer($"ws://{ConfigManager.Instance.Values.ServerAddress}:{ConfigManager.Instance.Values.ServerPort}");
             webSocketServer.AddWebSocketService<NeoWebSocketBehaviour>("/neo");
             webSocketServer.Start();
+
             Logger.Instance.Log(LogLevel.Info, $"Use {Dns.GetHostEntry(Dns.GetHostName()).AddressList.ToList().Find(ip => ip.AddressFamily == AddressFamily.InterNetwork)} to connect to this instance.", true);
             Logger.Instance.Log(LogLevel.Ok, "WebSocket server successfully started. Waiting for connections...");
         }
@@ -209,8 +252,11 @@ public abstract class BaseServer
         public void Stop() {
             ConfigManager.Instance.Save();
             DataProvider.Save();
+
             Logger.Instance.Log(LogLevel.Info, "Attempting to stop WebSocket server...");
+
             webSocketServer.Stop();
+
             Logger.Instance.Log(LogLevel.Ok, "WebSocket server successfully stopped");
         }
     }
diff --git a/Networking/WebServer.cs b/Networking/HttpServer.cs
similarity index 84%
rename from Networking/WebServer.cs
rename to Networking/HttpServer.cs
index eee5174..c6ed71a 100644
--- a/Networking/WebServer.cs
+++ b/Networking/HttpServer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -9,10 +8,11 @@
 
 namespace Neo.Core.Networking
 {
-    public class WebServer
+    /// <summary>
+    ///     Represents a server used to handle all HTTP communication.
+    /// </summary>
+    public class HttpServer
     {
-        public int Port { get; private set; }
-
         private static readonly IDictionary<string, string> mimeTypeMappings = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase) {
             #region Extension to MIME type list
             { ".asf", "video/x-ms-asf" },
@@ -82,54 +82,53 @@ public class WebServer
             #endregion
         };
 
+        /// <summary>
+        ///     The port this <see cref="HttpServer"/> is listening on.
+        /// </summary>
+        public int Port { get; private set; }
+
         private readonly string[] indexFiles = {
             "index.html",
             "index.htm",
             "default.html",
             "default.htm"
         };
-
-        private Thread thread;
+        
         private string rootDirectory;
         private HttpListener listener;
         private CancellationTokenSource cancellationTokenSource;
 
 
         /// <summary>
-        ///     Initializes a new instance of the <see cref="WebServer"/> class.
+        ///     Initializes a new instance of the <see cref="HttpServer"/> class.
         /// </summary>
-        /// <param name="path">Directory path to serve.</param>
+        /// <param name="path">Path of the directory to serve.</param>
         /// <param name="port">Port to listen on.</param>
-        public WebServer(string path, int port) {
+        public HttpServer(string path, int port) {
             this.Initialize(path, port);
         }
 
         /// <summary>
-        ///     Initializes a new instance of the <see cref="WebServer"/> class.
+        ///     Initializes a new instance of the <see cref="HttpServer"/> class.
         /// </summary>
-        /// <param name="path">Directory path to serve.</param>
-        public WebServer(string path) {
+        /// <param name="path">Path of the directory to serve.</param>
+        public HttpServer(string path) {
             var l = new TcpListener(IPAddress.Loopback, 0);
-            l.Start();
 
+            l.Start();
             var port = ((IPEndPoint) l.LocalEndpoint).Port;
-
             l.Stop();
 
             this.Initialize(path, port);
         }
 
-        /// <summary>
-        ///     Stops the server and aborts all threads.
-        /// </summary>
-        public void Stop() {
-            cancellationTokenSource.Cancel();
-
-            //thread.Abort();
-
-            listener.Stop();
+        
+        private void Initialize(string path, int port) {
+            rootDirectory = path;
+            Port = port;
 
-            cancellationTokenSource.Dispose();
+            cancellationTokenSource = new CancellationTokenSource();
+            ThreadPool.QueueUserWorkItem(Listen, cancellationTokenSource.Token);
         }
 
         private void Listen(object obj) {
@@ -141,8 +140,9 @@ public class WebServer
             try {
                 listener.Start();
             } catch {
-                Logger.Instance.Log(LogLevel.Error, "WebServer couldn't be started. Make sure you are running in high priviledged mode.");
-                Logger.Instance.Log(LogLevel.Error, "Error starting WebServer on :" + Port + ". Avatars won't be available.");
+                // TODO: Improve Log Messages
+                Logger.Instance.Log(LogLevel.Error, "HttpServer couldn't be started. Make sure you are running in high priviledged mode.");
+                Logger.Instance.Log(LogLevel.Error, "Error starting HttpServer on :" + Port + ". Avatars won't be available.");
                 return;
             }
 
@@ -175,20 +175,20 @@ public class WebServer
 
             if (File.Exists(filename)) {
                 try {
-                    var input = new FileStream(filename, FileMode.Open);
+                    var stream = new FileStream(filename, FileMode.Open);
                     
                     context.Response.ContentType = mimeTypeMappings.TryGetValue(Path.GetExtension(filename), out var mime) ? mime : "application/octet-stream";
-                    context.Response.ContentLength64 = input.Length;
+                    context.Response.ContentLength64 = stream.Length;
                     context.Response.AddHeader("Date", DateTime.Now.ToString("r"));
                     context.Response.AddHeader("Last-Modified", File.GetLastWriteTime(filename).ToString("r"));
 
                     var buffer = new byte[1024 * 16];
                     int nbytes;
-                    while ((nbytes = input.Read(buffer, 0, buffer.Length)) > 0) {
+                    while ((nbytes = stream.Read(buffer, 0, buffer.Length)) > 0) {
                         context.Response.OutputStream.Write(buffer, 0, nbytes);
                     }
 
-                    input.Close();
+                    stream.Close();
 
                     context.Response.StatusCode = (int) HttpStatusCode.OK;
                     context.Response.OutputStream.Flush();
@@ -202,15 +202,13 @@ public class WebServer
             context.Response.OutputStream.Close();
         }
 
-        private void Initialize(string path, int port) {
-            rootDirectory = path;
-            Port = port;
-
-            cancellationTokenSource = new CancellationTokenSource();
-            ThreadPool.QueueUserWorkItem(Listen, cancellationTokenSource.Token);
-
-            //thread = new Thread(Listen);
-            //thread.Start();
+        /// <summary>
+        ///     Stops this <see cref="HttpServer"/>.
+        /// </summary>
+        public void Stop() {
+            cancellationTokenSource.Cancel();
+            listener.Stop();
+            cancellationTokenSource.Dispose();
         }
     }
 }
\ No newline at end of file
diff --git a/Networking/Target.cs b/Networking/Target.cs
index 3682f06..9234026 100644
--- a/Networking/Target.cs
+++ b/Networking/Target.cs
@@ -22,6 +22,7 @@ public class Target
 
         private List<string> targets = new List<string>();
 
+
         /// <summary>
         ///     Initializes a new instance of the <see cref="Target"/> class.
         /// </summary>
@@ -43,6 +44,7 @@ public class Target
             targets.Add(user.Client.ClientId);
         }
 
+        
         /// <summary>
         ///     Adds a recipient to the list of recipients.
         /// </summary>
@@ -133,7 +135,11 @@ public class Target
             return this;
         }
 
-        public void SendPackageTo(Package package) {
+        /// <summary>
+        ///     Sends a <see cref="Package"/> to all recipients.
+        /// </summary>
+        /// <param name="package">The <see cref="Package"/> to send.</param>
+        public void SendPackage(Package package) {
             Pool.Server.SendPackageTo(this, package);
         }
     }
diff --git a/Shared/Channel.cs b/Shared/Channel.cs
index 8045e8c..9f0227b 100644
--- a/Shared/Channel.cs
+++ b/Shared/Channel.cs
@@ -148,13 +148,13 @@ public class Channel : IAttributable
 
             if (message.Contains('@')) {
                 var mentions = message.Split(' ').ToList().Where(s => s.StartsWith('@') && Pool.Server.Users.Any(u => u.Identity.Id == s.Substring(1))).Select(s => s.Substring(1)).Distinct().ToList();
-                new Target().AddMany(Pool.Server.Users.FindAll(u => mentions.Contains(u.Identity.Id)).ToArray()).SendPackageTo(new Package(PackageType.Mention, received));
+                new Target().AddMany(Pool.Server.Users.FindAll(u => mentions.Contains(u.Identity.Id)).ToArray()).SendPackage(new Package(PackageType.Mention, received));
             }
 
-            new Target().AddMany(this).Remove(sender).SendPackageTo(new Package(PackageType.Message, received));
+            new Target().AddMany(this).Remove(sender).SendPackage(new Package(PackageType.Message, received));
 
             if (sender.ActiveChannel == this) {
-                new Target(sender).SendPackageTo(new Package(PackageType.Message, sent));
+                new Target(sender).SendPackage(new Package(PackageType.Message, sent));
             }
 
             SaveMessage(received);
diff --git a/Shared/Group.cs b/Shared/Group.cs
index 84689b1..6a5e27b 100644
--- a/Shared/Group.cs
+++ b/Shared/Group.cs
@@ -7,23 +7,50 @@
 
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Represents a set of <see cref="User"/>s.
+    /// </summary>
     public class Group : IAttributable, IAuthorizable
     {
+        /// <summary>
+        ///     The attributes assigned to this <see cref="Group"/>.
+        /// </summary>
         public Dictionary<string, object> Attributes { get; set; } = new Dictionary<string, object>();
 
+        /// <summary>
+        ///     The user-defined id of this <see cref="Group"/>.
+        /// </summary>
         public string Id { get; set; }
 
+        /// <summary>
+        ///     The unique id used to identify this <see cref="Group"/>.
+        /// </summary>
         public Guid InternalId { get; set; } = Guid.NewGuid();
 
+        /// <summary>
+        ///     Contains the internal ids of all members of this <see cref="Group"/>.
+        /// </summary>
         public List<Guid> MemberIds { get; set; } = new List<Guid>();
 
+        /// <summary>
+        ///     Contains all <see cref="Account"/>s that are members of this <see cref="Group"/>.
+        /// </summary>
         [JsonIgnore]
         public List<Account> Members => MemberIds.Select(m => Pool.Server.Accounts.Find(a => a.InternalId == m)).ToList();
 
+        /// <summary>
+        ///     The name of this <see cref="Group"/>.
+        /// </summary>
         public string Name { get; set; }
 
+        /// <summary>
+        ///     The permissions granted to all members of this <see cref="Group"/>.
+        /// </summary>
         public Dictionary<string, Permission> Permissions { get; set; } = new Dictionary<string, Permission>();
 
+        /// <summary>
+        ///     Determines the sort and inheritance order of this <see cref="Group"/>.
+        /// </summary>
         public int SortValue { get; set; }
     }
 }
diff --git a/Shared/Guest.cs b/Shared/Guest.cs
index ba57a3f..bc4cc4d 100644
--- a/Shared/Guest.cs
+++ b/Shared/Guest.cs
@@ -2,6 +2,9 @@
 
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Represents an anonymous <see cref="User"/>.
+    /// </summary>
     public class Guest : User
     {
     }
diff --git a/Shared/Identity.cs b/Shared/Identity.cs
index 5e45c52..402543a 100644
--- a/Shared/Identity.cs
+++ b/Shared/Identity.cs
@@ -1,9 +1,23 @@
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Represents the public appearance of a <see cref="User"/>.
+    /// </summary>
     public class Identity
     {
+        /// <summary>
+        ///     The user-defined id of the <see cref="User"/>.
+        /// </summary>
         public string Id { get; set; }
+
+        /// <summary>
+        ///     The name of the <see cref="User"/>.
+        /// </summary>
         public string Name { get; set; }
+
+        /// <summary>
+        ///     The file extension of the avatar of the <see cref="User"/>.
+        /// </summary>
         public string AvatarFileExtension { get; set; }
     }
 }
diff --git a/Shared/LifeSpan.cs b/Shared/LifeSpan.cs
index 07b085f..d62e6a4 100644
--- a/Shared/LifeSpan.cs
+++ b/Shared/LifeSpan.cs
@@ -3,12 +3,27 @@
 
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Specifies the type of a <see cref="Channel"/>.
+    /// </summary>
     [JsonConverter(typeof(StringEnumConverter))]
     public enum Lifespan
     {
+        /// <summary>
+        ///     The <see cref="Channel"/> will be deleted automatically on a given date.
+        /// </summary>
         Custom,
+        /// <summary>
+        ///     The <see cref="Channel"/> will be deleted automatically when all members are gone.
+        /// </summary>
         Volatile,
+        /// <summary>
+        ///     The <see cref="Channel"/> will be deleted automatically when the server stops.
+        /// </summary>
         Temporary,
+        /// <summary>
+        ///     The <see cref="Channel"/> will persist and has to be deleted manually.
+        /// </summary>
         Permanent
     }
 }
diff --git a/Shared/Logger.cs b/Shared/Logger.cs
index 56433d1..38656f4 100644
--- a/Shared/Logger.cs
+++ b/Shared/Logger.cs
@@ -3,8 +3,18 @@
 
 namespace Neo.Core.Shared
 {
+    // TODO: Add Channels and Files as output channels
+    /// <summary>
+    ///     Represents a single access point for logging information into different outputs.
+    ///     <para>
+    ///         This class uses a thread-safe singleton lazy pattern and can only be accessed through the <see cref="Instance"/> property.
+    ///     </para>
+    /// </summary>
     public sealed class Logger
     {
+        /// <summary>
+        ///     Returns the only instance of the <see cref="Logger"/>.
+        /// </summary>
         public static Logger Instance => instance.Value;
 
         private static readonly Lazy<Logger> instance = new Lazy<Logger>(() => new Logger());
@@ -20,6 +30,12 @@ public sealed class Logger
             { LogLevel.Fatal, ConsoleColor.Red }
         };
 
+        /// <summary>
+        ///     Logs the specified message to all outputs.
+        /// </summary>
+        /// <param name="level">The <see cref="LogLevel"/> of this message.</param>
+        /// <param name="message">The content of this message.</param>
+        /// <param name="verbose">Whether the message should be displayed more prominently.</param>
         public void Log(LogLevel level, string message, bool verbose = false) {
             if (verbose) {
                 Console.WriteLine();
@@ -49,13 +65,34 @@ public sealed class Logger
         }
     }
 
+    /// <summary>
+    ///     Specifies the level of a log message.
+    /// </summary>
     public enum LogLevel
     {
+        /// <summary>
+        ///     The message contains debug information.
+        /// </summary>
         Debug,
+        /// <summary>
+        ///     The message contains general information.
+        /// </summary>
         Info,
+        /// <summary>
+        ///     The message contains information about a successful action.
+        /// </summary>
         Ok,
+        /// <summary>
+        ///     The message contains warnings.
+        /// </summary>
         Warn,
+        /// <summary>
+        ///     The message contains error information.
+        /// </summary>
         Error,
+        /// <summary>
+        ///     The message contains information about a failed action.
+        /// </summary>
         Fatal
     }
 }
diff --git a/Shared/Member.cs b/Shared/Member.cs
index d3c9861..76c883e 100644
--- a/Shared/Member.cs
+++ b/Shared/Member.cs
@@ -4,24 +4,45 @@
 
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Represents a registered <see cref="User"/>.
+    /// </summary>
     public class Member : User
     {
+        /// <summary>
+        ///     The <see cref="Neo.Core.Shared.Account"/> associated with this <see cref="Member"/>.
+        /// </summary>
         public Account Account { get; set; }
 
+        /// <summary>
+        ///     The attributes assigned to this <see cref="Member"/>.
+        /// </summary>
         public override Dictionary<string, object> Attributes {
             get => Account.Attributes;
             set => Account.Attributes = value;
         }
 
+        /// <summary>
+        ///     Contains all <see cref="Group"/>s this <see cref="Member"/> is a member of.
+        /// </summary>
         public List<Group> Groups => Account.Groups;
 
+        /// <summary>
+        ///     The <see cref="Neo.Core.Shared.Identity"/> of this <see cref="Member"/>.
+        /// </summary>
         public override Identity Identity {
             get => Account.Identity;
             set => Account.Identity = value;
         }
 
+        /// <summary>
+        ///     The unique id used to identify this <see cref="Member"/>.
+        /// </summary>
         public override Guid InternalId => Account.InternalId;
 
+        /// <summary>
+        ///     The permissions granted to this <see cref="Member"/>.
+        /// </summary>
         public override Dictionary<string, Permission> Permissions {
             get => Account.Permissions;
             set => Account.Permissions = value;
diff --git a/Shared/Pool.cs b/Shared/Pool.cs
index 4cb074a..440c894 100644
--- a/Shared/Pool.cs
+++ b/Shared/Pool.cs
@@ -2,8 +2,14 @@
 
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Acts as an access point for the <see cref="BaseServer"/>.
+    /// </summary>
     public static class Pool
     {
+        /// <summary>
+        ///     The operating <see cref="BaseServer"/> instance.
+        /// </summary>
         public static BaseServer Server { get; set; }
     }
 }
diff --git a/Shared/User.cs b/Shared/User.cs
index abf99d8..355462d 100644
--- a/Shared/User.cs
+++ b/Shared/User.cs
@@ -7,24 +7,53 @@
 
 namespace Neo.Core.Shared
 {
+    /// <summary>
+    ///     Represents a single person using the client.
+    /// </summary>
     public abstract class User : IAttributable, IAuthorizable
     {
+        /// <summary>
+        ///     The <see cref="Channel"/> this <see cref="User"/> has currently opened.
+        /// </summary>
         [JsonIgnore]
         public Channel ActiveChannel => Pool.Server.Channels.Find(c => c.ActiveMemberIds.Contains(InternalId));
 
+        /// <summary>
+        ///     The attributes assigned to this <see cref="User"/>.
+        /// </summary>
         public virtual Dictionary<string, object> Attributes { get; set; } = new Dictionary<string, object>();
         
+        /// <summary>
+        ///     Contains all <see cref="Channel"/>s this <see cref="User"/> is a member of.
+        /// </summary>
         [JsonIgnore]
         public List<Channel> Channels => Pool.Server.Channels.FindAll(c => c.MemberIds.Contains(InternalId));
         
+        /// <summary>
+        ///     The <see cref="Networking.Client"/> associated with this <see cref="User"/>.
+        /// </summary>
         public Client Client { get; set; }
         
+        /// <summary>
+        ///     The <see cref="Identity"/> of this <see cref="User"/>.
+        /// </summary>
         public virtual Identity Identity { get; set; }
 
+        /// <summary>
+        ///     The unique id used to identify this <see cref="User"/>.
+        /// </summary>
         public virtual Guid InternalId { get; set; } = Guid.NewGuid();
         
+        /// <summary>
+        ///     The permissions granted to this <see cref="User"/>.
+        /// </summary>
         public virtual Dictionary<string, Permission> Permissions { get; set; } = new Dictionary<string, Permission>();
 
+
+        /// <summary>
+        ///     Returns a <see cref="Target"/> with this <see cref="User"/>.
+        /// </summary>
+        /// <returns>Returns the created <see cref="Target"/>.</returns>
         public Target ToTarget() {
             return new Target(this);
         }