Folder structure reorg