diff --git a/src/index.js b/src/index.js
index db538ac..7e05e75 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,7 +2,7 @@ var mc = require('minecraft-protocol');
 var EventEmitter = require('events').EventEmitter;
 var path = require('path');
 var requireIndex = require('requireindex');
-var serverPlugins = requireIndex(path.join(__dirname, 'lib', 'plugins'));
+var plugins = requireIndex(path.join(__dirname, 'lib', 'plugins'));
 if (process.env.NODE_ENV === 'dev'){
   require('longjohn');
 }
@@ -26,9 +26,9 @@ class MCServer extends EventEmitter {
 
   connect(options) {
     this._server = mc.createServer(options);
-    Object.keys(serverPlugins)
-      .filter(pluginName => serverPlugins[pluginName].server!=undefined)
-      .forEach(pluginName => serverPlugins[pluginName].server(this, options));
+    Object.keys(plugins)
+      .filter(pluginName => plugins[pluginName].server!=undefined)
+      .forEach(pluginName => plugins[pluginName].server(this, options));
     if(options.logging == true) this.createLog();
     this._server.on('error', error => this.emit('error',error));
     this._server.on('listening', () => this.emit('listening',this._server.socketServer.address().port));
diff --git a/src/lib/plugins/animations.js b/src/lib/plugins/animations.js
index 3b730ed..8b3999a 100644
--- a/src/lib/plugins/animations.js
+++ b/src/lib/plugins/animations.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player._client.on("arm_animation", () =>
     player._writeOthersNearby("animation", {
diff --git a/src/lib/plugins/blocks.js b/src/lib/plugins/blocks.js
index 00d64c2..9fb8895 100644
--- a/src/lib/plugins/blocks.js
+++ b/src/lib/plugins/blocks.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player.changeBlock=async (position,blockType,blockData) =>
   {
diff --git a/src/lib/plugins/border.js b/src/lib/plugins/border.js
index 31f45ce..42ee68b 100644
--- a/src/lib/plugins/border.js
+++ b/src/lib/plugins/border.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   //WIP: Does't work
  /* player._client.write('world_border', {
diff --git a/src/lib/plugins/chat.js b/src/lib/plugins/chat.js
index ea4a213..1543cbf 100644
--- a/src/lib/plugins/chat.js
+++ b/src/lib/plugins/chat.js
@@ -7,7 +7,7 @@ module.exports.server=function(serv)
     }));
 };
 
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player._client.on('chat', ({message} = {}) => {
     if(message[0]=="/") {
diff --git a/src/lib/plugins/chest.js b/src/lib/plugins/chest.js
index 2f90607..f63e4e4 100644
--- a/src/lib/plugins/chest.js
+++ b/src/lib/plugins/chest.js
@@ -1,6 +1,6 @@
 var vec3 = require("vec3");
 
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player._client.on('block_place', async ({location} = {}) => {
     var referencePosition=new vec3(location.x,location.y,location.z);
diff --git a/src/lib/plugins/commands.js b/src/lib/plugins/commands.js
index cf43a36..8f16e5e 100644
--- a/src/lib/plugins/commands.js
+++ b/src/lib/plugins/commands.js
@@ -2,7 +2,7 @@ var Vec3 = require('vec3');
 
 var Command = require('../command');
 
-module.exports.player=function(serv, player) {
+module.exports.player=function(player, serv) {
   var base = new Command({});
 
   base.add({
diff --git a/src/lib/plugins/communication.js b/src/lib/plugins/communication.js
index 759b4cf..2d7060e 100644
--- a/src/lib/plugins/communication.js
+++ b/src/lib/plugins/communication.js
@@ -1,4 +1,4 @@
-module.exports.server=function(serv,settings)
+module.exports.server=function(serv)
 {
   serv._writeAll= (packetName, packetFields) =>
     serv.players.forEach((player) => player._client.write(packetName, packetFields));
@@ -22,7 +22,7 @@ module.exports.server=function(serv,settings)
     );
 };
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player._writeOthers= (packetName, packetFields) =>
     player
diff --git a/src/lib/plugins/daycycle.js b/src/lib/plugins/daycycle.js
index 41a39ea..dbed975 100644
--- a/src/lib/plugins/daycycle.js
+++ b/src/lib/plugins/daycycle.js
@@ -1,4 +1,4 @@
-module.exports.server=function(serv, settings) {
+module.exports.server=function(serv) {
   serv.setTime = (time) => {
     serv.time = time;
     serv._writeAll('update_time', {
diff --git a/src/lib/plugins/digging.js b/src/lib/plugins/digging.js
index 0147f2f..9edfb97 100644
--- a/src/lib/plugins/digging.js
+++ b/src/lib/plugins/digging.js
@@ -1,6 +1,6 @@
 var Vec3 = require("vec3");
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player._client.on("block_dig",({location,status} = {}) => {
     var pos=new Vec3(location);
@@ -96,4 +96,4 @@ module.exports.player=function(serv,player)
     return player.changeBlock(location,0,0);
   }
 
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/lib/plugins/entities.js b/src/lib/plugins/entities.js
index 30b48e4..d0ba0d5 100644
--- a/src/lib/plugins/entities.js
+++ b/src/lib/plugins/entities.js
@@ -17,7 +17,7 @@ module.exports.server=function(serv,options) {
 
     Object.keys(plugins)
       .filter(pluginName => plugins[pluginName].entity!=undefined)
-      .forEach(pluginName => plugins[pluginName].entity(serv, entity, options));
+      .forEach(pluginName => plugins[pluginName].entity(entity, serv, options));
 
     entity.initEntity(type, entityType, world, position);
 
@@ -69,7 +69,7 @@ module.exports.server=function(serv,options) {
   }
 };
 
-module.exports.entity=function(serv,entity){
+module.exports.entity=function(entity,serv){
 
   entity.initEntity=(type, entityType, world, position)=>{
     entity.type = type;
diff --git a/src/lib/plugins/header.js b/src/lib/plugins/header.js
index 722bce7..4c07748 100644
--- a/src/lib/plugins/header.js
+++ b/src/lib/plugins/header.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player.playerlistUpdateText = (header, footer) =>
     player._client.write('playerlist_header', {
diff --git a/src/lib/plugins/inventory.js b/src/lib/plugins/inventory.js
index 49a9249..754626c 100644
--- a/src/lib/plugins/inventory.js
+++ b/src/lib/plugins/inventory.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player.heldItemSlot=0;
   player.heldItem=0;
diff --git a/src/lib/plugins/log.js b/src/lib/plugins/log.js
index bdd14d4..711c280 100644
--- a/src/lib/plugins/log.js
+++ b/src/lib/plugins/log.js
@@ -44,7 +44,7 @@ module.exports.server=function(serv,settings)
   };
 };
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
 
   player.on("connected",() => serv.log("[INFO]: " + player.username + ' connected'));
diff --git a/src/lib/plugins/login.js b/src/lib/plugins/login.js
index 261f3c7..e25603b 100644
--- a/src/lib/plugins/login.js
+++ b/src/lib/plugins/login.js
@@ -3,7 +3,7 @@ var Vec3=require("vec3");
 
 var path = require('path');
 var requireIndex = require('requireindex');
-var playerPlugins = requireIndex(path.join(__dirname,'..', 'plugins'));
+var plugins = requireIndex(path.join(__dirname,'..', 'plugins'));
 var Player=require("../player");
 
 module.exports.server=function(serv,options)
@@ -14,9 +14,9 @@ module.exports.server=function(serv,options)
   serv._server.on('login', async (client) => {
     var player=new Player();
     player._client=client;
-    Object.keys(playerPlugins)
-      .filter(pluginName => playerPlugins[pluginName].player!=undefined)
-      .forEach(pluginName => playerPlugins[pluginName].player(serv, player, options));
+    Object.keys(plugins)
+      .filter(pluginName => plugins[pluginName].player!=undefined)
+      .forEach(pluginName => plugins[pluginName].player(player, serv, options));
 
     serv.emit("newPlayer",player);
     try {
@@ -28,7 +28,7 @@ module.exports.server=function(serv,options)
   });
 };
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   function addPlayer()
   {
diff --git a/src/lib/plugins/logout.js b/src/lib/plugins/logout.js
index 2edafd7..ab8c6c2 100644
--- a/src/lib/plugins/logout.js
+++ b/src/lib/plugins/logout.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player.despawnPlayers = despawnedPlayers => {
     player._client.write('entity_destroy', {
diff --git a/src/lib/plugins/moderation.js b/src/lib/plugins/moderation.js
index fd5b870..d765196 100644
--- a/src/lib/plugins/moderation.js
+++ b/src/lib/plugins/moderation.js
@@ -47,7 +47,7 @@ module.exports.server=function(serv)
   serv.bannedPlayers = {};
 };
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player.kick = reason =>
   {
diff --git a/src/lib/plugins/modpe.js b/src/lib/plugins/modpe.js
index 22f2779..3adde42 100644
--- a/src/lib/plugins/modpe.js
+++ b/src/lib/plugins/modpe.js
@@ -148,10 +148,10 @@ module.exports.server=function(serv,settings)
     });
 
   serv.on("newPlayer", function (player) {
-    injectPlayer(serv, player);
+    injectPlayer(player,serv);
   });
 
-  function injectPlayer(serv, player) {
+  function injectPlayer(player,serv) {
     log("Injected into player");
 
     initSquid(player, serv, vec3);
diff --git a/src/lib/plugins/physics.js b/src/lib/plugins/physics.js
index 2d92636..15708bc 100644
--- a/src/lib/plugins/physics.js
+++ b/src/lib/plugins/physics.js
@@ -1,7 +1,7 @@
 var blocks=require("minecraft-data")(require("../version")).blocks;
 var vec3 = require("vec3");
 
-module.exports.entity=function(serv,entity){
+module.exports.entity=function(entity){
   entity.calculatePhysics = async (delta) => {
     if (entity.gravity) {
       addGravity(entity, 'x', delta);
diff --git a/src/lib/plugins/placeBlock.js b/src/lib/plugins/placeBlock.js
index 00318b4..a58a00e 100644
--- a/src/lib/plugins/placeBlock.js
+++ b/src/lib/plugins/placeBlock.js
@@ -11,7 +11,7 @@ var materialToSound = {
   'wood': 'wood'
 };
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player._client.on("block_place",({direction,heldItem,location} = {}) => {
     if(direction==-1 || heldItem.blockId==-1) return;
diff --git a/src/lib/plugins/pvp.js b/src/lib/plugins/pvp.js
index 8fdeeaa..b49a30d 100644
--- a/src/lib/plugins/pvp.js
+++ b/src/lib/plugins/pvp.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player,serv)
 {
 
   player.updateHealth = (health) => {
diff --git a/src/lib/plugins/respawn.js b/src/lib/plugins/respawn.js
index ef55ac8..d349504 100644
--- a/src/lib/plugins/respawn.js
+++ b/src/lib/plugins/respawn.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player._client.on("client_command", ({payload}) => {
     if(payload == 0) {
diff --git a/src/lib/plugins/settings.js b/src/lib/plugins/settings.js
index b56df06..7e37225 100644
--- a/src/lib/plugins/settings.js
+++ b/src/lib/plugins/settings.js
@@ -13,7 +13,7 @@ module.exports.server=function(serv,settings)
 };
 
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player,serv)
 {
   player.gameMode=serv.gameMode;
   player.spawnPoint=serv.getSpawnPoint();
diff --git a/src/lib/plugins/signs.js b/src/lib/plugins/signs.js
index c973881..8e1165a 100644
--- a/src/lib/plugins/signs.js
+++ b/src/lib/plugins/signs.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
 //WIP: temporary removed
 };
\ No newline at end of file
diff --git a/src/lib/plugins/sound.js b/src/lib/plugins/sound.js
index 8e53fbe..6a0285c 100644
--- a/src/lib/plugins/sound.js
+++ b/src/lib/plugins/sound.js
@@ -33,7 +33,7 @@ module.exports.server=function(serv) {
   serv.getNote = note => 0.5 * Math.pow(Math.pow(2, 1/12), note);
 };
 
-module.exports.player=function(serv, player) {
+module.exports.player=function(player,serv) {
   player.playSound = (sound, opt={}) => {
     opt.whitelist = player;
     serv.playSound(sound, player.world, null, opt);
diff --git a/src/lib/plugins/stats.js b/src/lib/plugins/stats.js
index de14487..69b4f7d 100644
--- a/src/lib/plugins/stats.js
+++ b/src/lib/plugins/stats.js
@@ -1,4 +1,4 @@
-module.exports.player=function(serv, player)
+module.exports.player=function(player)
 {
   player._client.on('client_command', ({payload} = {}) => {
     if(payload==1){
diff --git a/src/lib/plugins/tick.js b/src/lib/plugins/tick.js
index a7351bd..c83018c 100644
--- a/src/lib/plugins/tick.js
+++ b/src/lib/plugins/tick.js
@@ -1,4 +1,4 @@
-module.exports.server=function(serv, settings) {
+module.exports.server=function(serv) {
   serv.tickCount = 0;
   serv.lastTickTime = 0;
 
diff --git a/src/lib/plugins/updatePositions.js b/src/lib/plugins/updatePositions.js
index a97f81c..a7c3051 100644
--- a/src/lib/plugins/updatePositions.js
+++ b/src/lib/plugins/updatePositions.js
@@ -4,7 +4,7 @@ vec3.Vec3.prototype.toFixedPosition=function() {
   return this.scaled(32).floored();
 };
 
-module.exports.player=function(serv,player)
+module.exports.player=function(player)
 {
   player._client.on('look', ({yaw,pitch,onGround} = {}) => sendLook(yaw,pitch,onGround));
 
@@ -85,9 +85,7 @@ module.exports.player=function(serv,player)
   };
 };
 
-module.exports.entity=function(serv,entity){
-
-
+module.exports.entity=function(entity,serv){
   entity.sendPosition = ({oldPos,onGround}) => {
     var diff = entity.position.minus(oldPos);
 
diff --git a/src/lib/plugins/world.js b/src/lib/plugins/world.js
index 0a69c2f..f19f7c0 100644
--- a/src/lib/plugins/world.js
+++ b/src/lib/plugins/world.js
@@ -52,7 +52,7 @@ module.exports.server=function(serv,{regionFolder,generation={"name":"diamond_sq
   //serv.pregenWorld(serv.netherworld).then(() => serv.log('Pre-Generated Nether'));
 };
 
-module.exports.player=function(serv, player) {
+module.exports.player=function(player) {
 
   player.spawnEntity = entity => {
     player._client.write(entity.spawnPacketName, entity.getSpawnPacket());