diff --git a/.biblio.yaml b/.biblio.yaml
deleted file mode 100644
index 28d1406..0000000
--- a/.biblio.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Disco
-
-rules:
-  disco/*.py:
-    parser: numpy
-
-outputs:
-  - {type: markdown, path: docs/api/, title: 'Disco Documentation'}
diff --git a/docs/README.md b/bot_tutorial/README.md
similarity index 100%
rename from docs/README.md
rename to bot_tutorial/README.md
diff --git a/docs/SUMMARY.md b/bot_tutorial/SUMMARY.md
similarity index 100%
rename from docs/SUMMARY.md
rename to bot_tutorial/SUMMARY.md
diff --git a/docs/bot_tutorial/advanced.md b/bot_tutorial/advanced.md
similarity index 100%
rename from docs/bot_tutorial/advanced.md
rename to bot_tutorial/advanced.md
diff --git a/docs/bot_tutorial/building_block_commands.md b/bot_tutorial/building_block_commands.md
similarity index 97%
rename from docs/bot_tutorial/building_block_commands.md
rename to bot_tutorial/building_block_commands.md
index 785f672..6022d01 100644
--- a/docs/bot_tutorial/building_block_commands.md
+++ b/bot_tutorial/building_block_commands.md
@@ -1,113 +1,113 @@
-# Commands
-
-Commands are a big part of the Discord bot usage. A command can be defined as an order you give to a bot. Basic examples of commands are:
-`!help` or `!info`, most bots have either of the two.
-In the case of these examples, when you send `!help` or `!info` the bot will reply with a help or info message.
-
-## Basic commands
-
-Creating commands in Disco is really easy because of the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) that are a core fundamental of Disco. For more info on them, read back in the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) section of this tutorial. Creating a basic command is done as follows:
-First, create a Plugin class:
-```py
-class myPlugin(Plugin):
-```
-Now, we can add a command to it. The command will be named ping, and it will simply reply with `pong!`
-```py
-@Plugin.command('ping')
-def on_ping_command(self, event):
-  event.msg.reply('Pong!')
-```
-And there we go! Our very first command!
-
-## Command arguments
-
-Next, lets go on to some more advanced commands. Wye'll create an echo command that will respond with whatever we put in to it.
-```py
-@Plugin.command('echo', '<content:str...>')
-def on_echo_command(self, event, content):
-  event.msg.reply(content)
-```
-What we did here, was add an argument to our command. The argument we created here, content, is required. This means the command won't work if you don't pass in data for the `content` argument.
-You can also add optional arguments to a command. Instead of surrounding the name and type in angle brackets, you'd surround them in square brackets like this: `[content:str...]`
-Keep in mind that arguments that are optional might not be there. You'll have to create some checks so that your program doesn't crash on unexpected null values.
-
-## Command groups
-
-Now that we have 2 basic commands and we know to create basic commands and add some arguments to it. Let's create a more advanced command utilizing what we just learned.
-The command will take 2 numbers (integers) and simply adds them together. It will work like this: `!math add 1 4` and it would return 5. Instead of passing `'math add'` as the command name, we'll be using command groups here.
-Using command groups you can easily group commands together and create sub commands. Now, here comes our math command:
-```py
-@Plugin.command('add', '<a:int> <b:int>', group='math')
-def on_add_command(self, event, a, b):
-  event.msg.reply('{}'.format(a+b))
-```
-Here, we added multiple arguments to our command. Namely, number a and number b, that we add together and return back. Of course, you can do loads more fun things with the Disco command handler.
-
-## Optional arguments
-
-Lets create a tag system, that can either store a tag if you'd use it like this: `!tag name value` or retrieve a tag if you'd use it like this: `!tag name`
-
-We'll need 2 arguments. A name argument that's required, and an optional value argument. Inside the command we'll check if a `value` is provided. If there is, we'll store the tag. Otherwise, we'll try to retrieve the previously set value for that tag and return it.
-For the sake of this example, we'll assume that the `tags` dict gets stored somewhere so it doesn't get removed after a restart.
-```py
-tags = {}
-
-@Plugin.command('tag', '<name:str> [value:str...]')
-def on_tag_command(self, event, name, value=None):
-
-  if value:
-    tags[name] = value
-    event.msg.reply(':ok_hand: created tag `{}`'.format(name))
-  else:
-    if name in tags.keys():
-      return event.msg.reply(tags[name])
-    else:
-      return event.msg.reply('Unknown tag: `{}`'.format(name))
-```
-
-## ArgumentParser
-
-A different way of adding arguments to a command is by using `argparse.ArgumentParser`. With `argparser` it's easier to create more complicated commands with many options or flags.
-Let's put this into practice by recreating our math add command, but using `argparser`. More info on `argparser` and the `add_argument()` method can be found [here](https://docs.python.org/2/library/argparse.html#the-add-argument-method)
-```py
-@Plugin.command('add', parser=True, group='math')
-@Plugin.parser.add_argument('a', type=int)
-@Plugin.parser.add_argument('b', type=int)
-def on_add_command(self, event, args):
-  event.msg.reply('{}'.format(args.a + args.b)
-```
-
-These are all the commands we created in this tutorial:
-```py
-class myPlugin(Plugin):
-  @Plugin.command('ping')
-  def on_ping_command(self, event):
-    event.msg.reply('Pong!')
-    
-  @Plugin.command('echo', '<content:str...>')
-  def on_echo_command(self, event, content):
-    event.msg.reply(content)
-    
-  @Plugin.command('add', '<a:int> <b:int>', group='math')
-  def on_add_command(self, event, a, b):
-    event.msg.reply('{}'.format(a+b))
-
-  tags = {}
-  @Plugin.command('tag', '<name:str> [value:str...]')
-  def on_tag_command(self, event, name, value=None):
-
-    if value:
-      tags[name] = value
-      event.msg.reply(':ok_hand: created tag `{}`'.format(name))
-    else:
-      if name in tags.keys():
-        return event.msg.reply(tags[name])
-      else:
-        return event.msg.reply('Unknown tag: `{}`'.format(name))
-        
-  @Plugin.command('add', parser=True, group='math')
-  @Plugin.parser.add_argument('a', type=int)
-  @Plugin.parser.add_argument('b', type=int)
-  def on_add_command(self, event, args):
-    event.msg.reply('{}'.format(args.a + args.b)
-```
+# Commands
+
+Commands are a big part of the Discord bot usage. A command can be defined as an order you give to a bot. Basic examples of commands are:
+`!help` or `!info`, most bots have either of the two.
+In the case of these examples, when you send `!help` or `!info` the bot will reply with a help or info message.
+
+## Basic commands
+
+Creating commands in Disco is really easy because of the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) that are a core fundamental of Disco. For more info on them, read back in the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) section of this tutorial. Creating a basic command is done as follows:
+First, create a Plugin class:
+```py
+class myPlugin(Plugin):
+```
+Now, we can add a command to it. The command will be named ping, and it will simply reply with `pong!`
+```py
+@Plugin.command('ping')
+def on_ping_command(self, event):
+  event.msg.reply('Pong!')
+```
+And there we go! Our very first command!
+
+## Command arguments
+
+Next, lets go on to some more advanced commands. Wye'll create an echo command that will respond with whatever we put in to it.
+```py
+@Plugin.command('echo', '<content:str...>')
+def on_echo_command(self, event, content):
+  event.msg.reply(content)
+```
+What we did here, was add an argument to our command. The argument we created here, content, is required. This means the command won't work if you don't pass in data for the `content` argument.
+You can also add optional arguments to a command. Instead of surrounding the name and type in angle brackets, you'd surround them in square brackets like this: `[content:str...]`
+Keep in mind that arguments that are optional might not be there. You'll have to create some checks so that your program doesn't crash on unexpected null values.
+
+## Command groups
+
+Now that we have 2 basic commands and we know to create basic commands and add some arguments to it. Let's create a more advanced command utilizing what we just learned.
+The command will take 2 numbers (integers) and simply adds them together. It will work like this: `!math add 1 4` and it would return 5. Instead of passing `'math add'` as the command name, we'll be using command groups here.
+Using command groups you can easily group commands together and create sub commands. Now, here comes our math command:
+```py
+@Plugin.command('add', '<a:int> <b:int>', group='math')
+def on_add_command(self, event, a, b):
+  event.msg.reply('{}'.format(a+b))
+```
+Here, we added multiple arguments to our command. Namely, number a and number b, that we add together and return back. Of course, you can do loads more fun things with the Disco command handler.
+
+## Optional arguments
+
+Lets create a tag system, that can either store a tag if you'd use it like this: `!tag name value` or retrieve a tag if you'd use it like this: `!tag name`
+
+We'll need 2 arguments. A name argument that's required, and an optional value argument. Inside the command we'll check if a `value` is provided. If there is, we'll store the tag. Otherwise, we'll try to retrieve the previously set value for that tag and return it.
+For the sake of this example, we'll assume that the `tags` dict gets stored somewhere so it doesn't get removed after a restart.
+```py
+tags = {}
+
+@Plugin.command('tag', '<name:str> [value:str...]')
+def on_tag_command(self, event, name, value=None):
+
+  if value:
+    tags[name] = value
+    event.msg.reply(':ok_hand: created tag `{}`'.format(name))
+  else:
+    if name in tags.keys():
+      return event.msg.reply(tags[name])
+    else:
+      return event.msg.reply('Unknown tag: `{}`'.format(name))
+```
+
+## ArgumentParser
+
+A different way of adding arguments to a command is by using `argparse.ArgumentParser`. With `argparser` it's easier to create more complicated commands with many options or flags.
+Let's put this into practice by recreating our math add command, but using `argparser`. More info on `argparser` and the `add_argument()` method can be found [here](https://docs.python.org/2/library/argparse.html#the-add-argument-method)
+```py
+@Plugin.command('add', parser=True, group='math')
+@Plugin.parser.add_argument('a', type=int)
+@Plugin.parser.add_argument('b', type=int)
+def on_add_command(self, event, args):
+  event.msg.reply('{}'.format(args.a + args.b)
+```
+
+These are all the commands we created in this tutorial:
+```py
+class myPlugin(Plugin):
+  @Plugin.command('ping')
+  def on_ping_command(self, event):
+    event.msg.reply('Pong!')
+    
+  @Plugin.command('echo', '<content:str...>')
+  def on_echo_command(self, event, content):
+    event.msg.reply(content)
+    
+  @Plugin.command('add', '<a:int> <b:int>', group='math')
+  def on_add_command(self, event, a, b):
+    event.msg.reply('{}'.format(a+b))
+
+  tags = {}
+  @Plugin.command('tag', '<name:str> [value:str...]')
+  def on_tag_command(self, event, name, value=None):
+
+    if value:
+      tags[name] = value
+      event.msg.reply(':ok_hand: created tag `{}`'.format(name))
+    else:
+      if name in tags.keys():
+        return event.msg.reply(tags[name])
+      else:
+        return event.msg.reply('Unknown tag: `{}`'.format(name))
+        
+  @Plugin.command('add', parser=True, group='math')
+  @Plugin.parser.add_argument('a', type=int)
+  @Plugin.parser.add_argument('b', type=int)
+  def on_add_command(self, event, args):
+    event.msg.reply('{}'.format(args.a + args.b)
+```
diff --git a/docs/bot_tutorial/building_block_listeners.md b/bot_tutorial/building_block_listeners.md
similarity index 100%
rename from docs/bot_tutorial/building_block_listeners.md
rename to bot_tutorial/building_block_listeners.md
diff --git a/docs/bot_tutorial/building_block_plugins.md b/bot_tutorial/building_block_plugins.md
similarity index 100%
rename from docs/bot_tutorial/building_block_plugins.md
rename to bot_tutorial/building_block_plugins.md
diff --git a/docs/bot_tutorial/first_steps.md b/bot_tutorial/first_steps.md
similarity index 100%
rename from docs/bot_tutorial/first_steps.md
rename to bot_tutorial/first_steps.md
diff --git a/docs/installation.md b/bot_tutorial/installation.md
similarity index 100%
rename from docs/installation.md
rename to bot_tutorial/installation.md
diff --git a/docs/bot_tutorial/message_embeds.md b/bot_tutorial/message_embeds.md
similarity index 97%
rename from docs/bot_tutorial/message_embeds.md
rename to bot_tutorial/message_embeds.md
index c8497e4..f941598 100644
--- a/docs/bot_tutorial/message_embeds.md
+++ b/bot_tutorial/message_embeds.md
@@ -1,61 +1,61 @@
-# Message Embeds
-
-A [Message Embed](https://b1naryth1ef.github.io/disco/api/disco_types_message.html#messageembed) represents a Discord Embed object. An Embed object is another component of Discord messages that can be used to present data with special formatting and structure.
-
-An example of a message embed: 
-
-![A discord embed](https://i.stack.imgur.com/HRWHk.png "A discord embed")
-
-An embed can contain the following components:
-* Author, including link and avatar
-* Title
-* Description
-* Field(s)
-* Thumbnail image
-* Image
-* Footer, including text and icon
-* Timestamp
-* Color (sets the color of the left sidebar of the embed)
-
-## Creating an embed
-Creating an embed is simple, and can be done like this:
-```py
-from disco.types.message import MessageEmbed #We need this to create the embed
-from datetime import datetime #We need this to set the timestamp
-
-embed = MessageEmbed()
-```
-This will create a default, empty, Discord Embed object. Now that we have that, let's assign some values to it. First, lets set the author and the title, with a link that leads to this page. This can be done as follows:
-```py
-embed.set_author(name='b1nzy#1337', url='https://b1naryth1ef.github.com/disco', icon_url='http://i.imgur.com/1tjdUId.jpg')
-embed.title = 'How to create an embed'
-embed.url = 'https://b1naryth1ef.github.io/disco/bot_tutorial/message_embeds.html' #This URL will be hooked up to the title of the embed
-```
-Now, we can add a description and a few fields:
-```py
-embed.add_field(name='Inline field 1', value='Some value for this field', inline=True)
-embed.add_field(name='Inline field 2', value='Another value for another field', inline=True)
-embed.add_field(name='Inline field 3', value='Third value for the third field', inline=True)
-embed.add_field(name='A non-inline field', value='You can only have a max of 3 inline field on 1 line', inline=False)
-embed.description = 'This is the general description of the embed, you can use the Discord supported MD in here too, to make it look extra fancy. For example, creating some **bold** or ~~strikethrough~~ text.'
-```
-Last up, let's set a footer, color and add a timestamp:
-```py
-embed.timestamp = datetime.utcnow().isoformat()
-embed.set_footer(text='Disco Message Embeds tutorial')
-embed.color = '10038562' #This can be any color, but I chose a nice dark red tint
-```
-
-Once your embed is finished, you can send it using the `channel.send_message()` message or the `event.msg.reply()` function.
-With `channel.send_message()`:
-```py
-self.state.channels.get(<ChannelID>).send_message('[optional text]', embed=embed)
-```
-with the `event.msg.reply()` function:
-```py
-event.msg.reply('[optional text]', embed=embed)
-```
-
-The final embed we created in this tutorial would look like this:
-
-![alt text](http://i.imgur.com/G1sUcTm.png "The final embed")
+# Message Embeds
+
+A [Message Embed](https://b1naryth1ef.github.io/disco/api/disco_types_message.html#messageembed) represents a Discord Embed object. An Embed object is another component of Discord messages that can be used to present data with special formatting and structure.
+
+An example of a message embed: 
+
+![A discord embed](https://i.stack.imgur.com/HRWHk.png "A discord embed")
+
+An embed can contain the following components:
+* Author, including link and avatar
+* Title
+* Description
+* Field(s)
+* Thumbnail image
+* Image
+* Footer, including text and icon
+* Timestamp
+* Color (sets the color of the left sidebar of the embed)
+
+## Creating an embed
+Creating an embed is simple, and can be done like this:
+```py
+from disco.types.message import MessageEmbed #We need this to create the embed
+from datetime import datetime #We need this to set the timestamp
+
+embed = MessageEmbed()
+```
+This will create a default, empty, Discord Embed object. Now that we have that, let's assign some values to it. First, lets set the author and the title, with a link that leads to this page. This can be done as follows:
+```py
+embed.set_author(name='b1nzy#1337', url='https://b1naryth1ef.github.com/disco', icon_url='http://i.imgur.com/1tjdUId.jpg')
+embed.title = 'How to create an embed'
+embed.url = 'https://b1naryth1ef.github.io/disco/bot_tutorial/message_embeds.html' #This URL will be hooked up to the title of the embed
+```
+Now, we can add a description and a few fields:
+```py
+embed.add_field(name='Inline field 1', value='Some value for this field', inline=True)
+embed.add_field(name='Inline field 2', value='Another value for another field', inline=True)
+embed.add_field(name='Inline field 3', value='Third value for the third field', inline=True)
+embed.add_field(name='A non-inline field', value='You can only have a max of 3 inline field on 1 line', inline=False)
+embed.description = 'This is the general description of the embed, you can use the Discord supported MD in here too, to make it look extra fancy. For example, creating some **bold** or ~~strikethrough~~ text.'
+```
+Last up, let's set a footer, color and add a timestamp:
+```py
+embed.timestamp = datetime.utcnow().isoformat()
+embed.set_footer(text='Disco Message Embeds tutorial')
+embed.color = '10038562' #This can be any color, but I chose a nice dark red tint
+```
+
+Once your embed is finished, you can send it using the `channel.send_message()` message or the `event.msg.reply()` function.
+With `channel.send_message()`:
+```py
+self.state.channels.get(<ChannelID>).send_message('[optional text]', embed=embed)
+```
+with the `event.msg.reply()` function:
+```py
+event.msg.reply('[optional text]', embed=embed)
+```
+
+The final embed we created in this tutorial would look like this:
+
+![alt text](http://i.imgur.com/G1sUcTm.png "The final embed")
diff --git a/docs/book.json b/docs/book.json
deleted file mode 100644
index 3ad1853..0000000
--- a/docs/book.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Disco",
-  "plugins": ["prism", "-highlight", "hints", "anchorjs"],
-	"pluginsConfig": {
-			"anchorjs": {
-					"placement": "left",
-					"visible": "always"
-			}
-	}
-}
diff --git a/docs/build.sh b/docs/build.sh
deleted file mode 100755
index 2e5fa45..0000000
--- a/docs/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-echo "Building Autogenerated API Docs"
-pushd ..
-python -m biblio.cli ../disco/.biblio.yaml
-popd
-
-echo "Running Gitbook Build"
-gitbook build
-
-if [ ! -z "${GH_TOKEN:-}" ]; then
-  echo "Deploying to Github Pages"
-  pushd _book/
-  git init
-  git config user.name "AutoDoc"
-  git config user.email "<>"
-  git add .
-  git commit -m "Generated Documentation"
-  git push --force --quiet "https://${GH_TOKEN}@github.com/b1naryth1ef/disco" master:gh-pages
-  popd
-fi
diff --git a/docs/types/channel.rst b/docs/types/channel.rst
new file mode 100644
index 0000000..e69de29
diff --git a/docs/types/index.rst b/docs/types/index.rst
new file mode 100644
index 0000000..e69de29