Reorganise tests directory structure