Rearrange folder structure (yet again) for supposed improvement in organization.