More folder cleanup.