Changed code layout, porting tests to Mocha