- Reorganised folder structure and files