Reorganized wrappers
BUILD_DEMO defaults to ON, options turned to advanced