Organize tests directory in a more thematic way