Adjusted Maps for solver and matrix generator

Made sure all functions are available and in proper scope.