changes to structure of source directory in solvers