Refactoring of class names (not completed yet) and scientific helper function improved.