Add mocha
Remove backup files
Some cleanup
More Cleanup!