Reorganizing folder structure.