Fixed
SimulatedAnnealing added
Refactoring of everything