pulled choice and variable into searchspaces namespace

First step to make the example from the paper work