Files & folders refactoring