Removed Library functionality, and started added structure for solver
Merge remote-tracking branch 'origin/master'