7.2 - Reorganised file structure