Folder structure reorg.