Reorganised file hierarchy