Reorganised file structure