Change folders and files structure; remove unused files