Moved stuff around, added sinon, readying for sample app testing