folder reorganization for better sorting