restructuring folder structure