File and folder reorganization