Folder structure preserved, functionality improved