diff --git a/lib/Client.js b/lib/Client.js
index 23b4fd713..bf08ba38c 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -5,12 +5,12 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var Endpoints = require("./Endpoints.js");
-var User = require("./User.js");
-var Server = require("./Server.js");
-var Channel = require("./Channel.js");
-var Message = require("./Message.js");
-var Invite = require("./Invite.js");
+var Endpoints = require("./endpoints.js");
+var User = require("./user.js");
+var Server = require("./server.js");
+var Channel = require("./channel.js");
+var Message = require("./message.js");
+var Invite = require("./invite.js");
 var PMChannel = require("./PMChannel.js");
 
 //node modules
diff --git a/src/Client.js b/src/Client.js
index d40222a4f..d7a0e069e 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -1,10 +1,10 @@
 //discord.js modules
-var Endpoints = require("./Endpoints.js");
-var User = require("./User.js");
-var Server = require("./Server.js");
-var Channel = require("./Channel.js");
-var Message = require("./Message.js");
-var Invite = require("./Invite.js");
+var Endpoints = require("./endpoints.js");
+var User = require("./user.js");
+var Server = require("./server.js");
+var Channel = require("./channel.js");
+var Message = require("./message.js");
+var Invite = require("./invite.js");
 var PMChannel = require("./PMChannel.js");
 
 //node modules
diff --git a/test/bot.js b/test/bot.js
index 5e6670da4..6dc4c9ca2 100644
--- a/test/bot.js
+++ b/test/bot.js
@@ -3,62 +3,16 @@
 */
 
 var Discord = require("../");
-var Auth = require("./auth.json");
 var mybot = new Discord.Client();
 
-mybot.login(Auth.email, Auth.password)
+mybot.login("email", "password").then(success).catch(error);
 
-	.then(function (token) {
-		console.log("wooo!");
-	}).catch(function (error) {
-		console.log(error);
-	});
+function success(){
+	console.log("login successful");
+	process.exit(0);
+}
 
-mybot.on("ready", function () {
-	console.log("Ready!");
-})
-
-mybot.on("message", function (msg) {
-	
-	if(msg.content === "pmme"){
-		console.log("yes we found it!");
-		mybot.setUsername("hydrabot").catch(function(err){
-			console.log(err);
-		});
-		mybot.reply(msg, "You know what "+msg.sender+"? NO").then(function(msg){
-			mybot.updateMessage(msg, "wat i sed nothin m8");
-		});
-		mybot.getChannelLogs(msg.channel).then(function(logs){
-			console.log(logs[0]);
-		}).catch(function(error){
-			console.log(error);
-		});
-	}
-	
-});
-
-mybot.on("messageDelete", function (channel, message) {
-
-	console.log("MESSAGE WAS DELETED BY " + (message ? message.author.username : channel.name));
-
-});
-
-mybot.on("messageUpdate", function (message, formerMessage) {
-
-	console.log(message.author.username, "changed", formerMessage.content, "to", message.content);
-
-});
-
-mybot.on("serverNewMember", function (user) {
-	console.log("new user", user.username);
-});
-mybot.on("serverRemoveMember", function (user) {
-	console.log("left user", user.username);
-});
-mybot.on("userUpdate", function (oldUser, newUser) {
-	console.log(oldUser, "vs", newUser);
-});
-
-mybot.on("channelCreate", function(chann){
-	console.log(chann);
-})
\ No newline at end of file
+function error(){
+	console.log("login error, but the API works");
+	process.exit(0);
+}
\ No newline at end of file