Attempt to rectify cluster issues by putting native code in separate directories

This is a guess that the build issues on the cluster arise from the
fact that we’re simultaneously building in the same directory - - and
that this doesn’t work unless the directory is the default.
Fix bug when X is None
Second attempt at fixing the X bug