Reorganize test packages in preparation for tomorrow's workshop