Moved solver class decls into header.
Cleaned up row assignments.

It is now done based on the problem geometry.