Split CSP and wolf-example, cleaned up code.