Refactoring implemented. First not quiet final version
Merge branch 'master' of https://github.com/And7s/MolSim