clean refactoring branch, splitted pre and post simulation, pip-tools, some fixes