Files and folders refactoring