File + folder refactoring