Merge with new directory structure (swig-r and swig-sw)