Folder and content reorg before it gets bigger