reorganize and remove yajl