Move folder structure properly