rab_solver file structure has been simplified.