Moved definition of fields etc to the right module. REOL-74