[WIP] Restructur solvers

- some renaming related to discussion
- start to extract solvers