Change structure and organize folders