Refactoring files and folders