Reorganised folder structure and added rent