Refactoring of the code based on the new structures.
Refactoring of the code based on the new structures.

atgeirr/equelle,babrodtk/equelle,sintefmath/equelle,sintefmath/equelle,atgeirr/equelle,sintefmath/equelle,sintefmath/equelle,atgeirr/equelle,babrodtk/equelle,sintefmath/equelle,atgeirr/equelle,atgeirr/equelle,babrodtk/equelle,atgeirr/equelle,sintefmath/equelle,atgeirr/equelle,babrodtk/equelle,sintefmath/equelle,babrodtk/equelle,atgeirr/equelle,sintefmath/equelle,babrodtk/equelle,babrodtk/equelle