Reorganizing folder structure and updating setup