Re-organised test data files into directory structure.