Reorganised folder structure.