Fix package.json
Major refactoring builder, rewrie all tests