Reorganized Pierre example
More cleanup in Pierre