Updated SVD and SVDCalculator with latest parameters. Refactoring.