Turning solver into submodule