refactoring of files and folders