Remove engines
Remove istanbul
Code organization