More of that folder structure cleanup...