diff --git a/LICENSE.txt b/LICENSE.txt
index e5e93233ad450233f8ec1bf0318034b675ad4865..9556dadf4fa51122fa3a0b59f8eeb78151da72de 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,13 +1,13 @@
-		BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014)
+		NIBIO OPEN SOURCE LICENSE V.1.0 (2014)
 
 			PREAMBLE AND ADDITIONAL TERMS
 
   The original licensor is the Norwegian Institute for Agricultural and 
 Environmental Research, registered in Norway with registration number 988 983 
 837, and business address NO-1430 ÅS, NORWAY, hereafter referred to as 
-"BIOFORSK". 
+"NIBIO". 
 
-  This BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014), in short the BIOFORSK Open 
+  This NIBIO OPEN SOURCE LICENSE V.1.0 (2014), in short the NIBIO Open 
 Source License, is based on the GNU Affero General Public License, version 3.
 All of the terms and conditions of the GNU Affero General Public License, 
 version 3, have been set out below, save the below mentioned additional 
@@ -15,26 +15,26 @@ prevailing terms that have priority over the terms otherwise identical to the
 GNU Affero General Public License, version 3, and that Section 0 ("This 
 License" definition changed), 13 ("version 3 of the GNU General Public License" 
 replaced by "this License") and 14 ("The Free Software Foundation" replaced by 
-"BIOFORSK" and "GNU Affero General Public License" replaced by "License") have 
+"NIBIO" and "GNU Affero General Public License" replaced by "License") have 
 been adjusted as a consequence of this.
 
 			ADDITONAL PREVAILING TERMS
 
-  (a) The BIOFORSK Open Source License regulates the BIOFORSK VIPS Platform 
+  (a) The NIBIO Open Source License regulates the NIBIO VIPS Platform 
 software, an Internet based system enabling prediction of infection risk of 
-plant diseases, pests and weeds. The BIOFORSK Open Source License DOES NOT 
+plant diseases, pests and weeds. The NIBIO Open Source License DOES NOT 
 INCLUDE the specific forecasting models, neither their algorithms nor their 
-implementation to be used by the BIOFORSK VIPS Platform. You are free to 
-implement any other forecasting model to be used by the BIOFORSK VIPS Platform, 
+implementation to be used by the NIBIO VIPS Platform. You are free to 
+implement any other forecasting model to be used by the NIBIO VIPS Platform, 
 regardless of license terms at your own responsibility. 
 
   (b) This license is governed by Norwegian law, as far as any party or third 
-party purports or sets forward any claim towards BIOFORSK. Any claims towards 
-BIOFORSK shall be solved by the exclusive venue of Oslo City Courts, Norway. 
+party purports or sets forward any claim towards NIBIO. Any claims towards 
+NIBIO shall be solved by the exclusive venue of Oslo City Courts, Norway. 
 This paragraph is not applicable for claims only between any later parties to 
 this license. 
 
-  (c) By entering into this agreement you also agree to indemnify BIOFORSK and 
+  (c) By entering into this agreement you also agree to indemnify NIBIO and 
 its employees / consultants / board, for any claims of liability related to 
 this license set forward by yourself or any party deviating its rights from you. 
 
@@ -44,17 +44,17 @@ this license set forward by yourself or any party deviating its rights from you.
  
 	This file is part of <application name>. <application name> is free 
 	software: you can redistribute it and/or modify it under the terms of 
-	the Bioforsk Open Source License as published by Bioforsk, either 
+	the NIBIO Open Source License as published by NIBIO, either 
 	version 1 of the License, or (at your option) any later version.
 
 	<application name> is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	Bioforsk Open Source License for more details.
+	NIBIO Open Source License for more details.
 
-	You should have received a copy of the Bioforsk Open Source License
+	You should have received a copy of the NIBIO Open Source License
 	along with <application name>.  If not, see 
-	<http://www.bioforsk.no/licenses/>.
+	<http://www.nibio.no/licenses/>.
 
       It is also recommended that you add information on how to contact you by 
       electronic and paper mail.
@@ -63,7 +63,7 @@ this license set forward by yourself or any party deviating its rights from you.
 
   2. 0. Definitions.
 
-  "This License" refers to BIOFORSK Open Source License v.1.0 (2014). 
+  "This License" refers to NIBIO Open Source License v.1.0 (2014). 
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -562,7 +562,7 @@ but the work with which it is combined will remain governed by version
 
   16. 14. Revised Versions of this License.
 
-  BIOFORSK may publish revised and/or new versions of the License from time to 
+  NIBIO may publish revised and/or new versions of the License from time to 
 time. Such new versions will be similar in spirit to the present version, but 
 may differ in detail to address new problems or concerns.
 
@@ -570,8 +570,8 @@ may differ in detail to address new problems or concerns.
 Program specifies that a certain numbered version of the License "or any later 
 version" applies to it, you have the option of following the terms and 
 conditions either of that numbered version or of any later version published by 
-BIOFORSK. If the Program does not specify a version number of the License, you 
-may choose any version ever published by the BIOFORSK.
+NIBIO. If the Program does not specify a version number of the License, you 
+may choose any version ever published by the NIBIO.
 
   If the Program specifies that a proxy can decide which future
 versions of the License can be used, that proxy's public statement of 
diff --git a/nb-configuration.xml b/nb-configuration.xml
index 33e441e8278864cc0db17e7c047d6f8753813a93..7103095542c1a062dedf6d7f32faa28c80b6c0de 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license>
+        <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
     </properties>
 </project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 3eed1c5e628b5304cc4d5580fbc2ea194634d02a..a4ad7ba68d97804d95ebb46c034b3c28d1fc3ebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>no.bioforsk.vips.model</groupId>
+  <groupId>no.nibio.vips.model</groupId>
   <artifactId>AppleScabModel</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -34,7 +34,7 @@
       <scope>test</scope>
     </dependency>
         <dependency>
-      <groupId>no.bioforsk.vips.common</groupId>
+      <groupId>no.nibio.vips.common</groupId>
       <artifactId>VIPSCommon</artifactId>
       <version>1.0-SNAPSHOT</version>
       <scope>provided</scope>
diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabCalculations.java b/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabCalculations.java
similarity index 60%
rename from src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabCalculations.java
rename to src/main/java/no/nibio/vips/model/applescabmodel/AppleScabCalculations.java
index 2a20ce11c7c10f96ca06eb5b18bc00ee84ac26de..49938091fecd181a4a349e20bcbbd5a5d3ab760b 100644
--- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabCalculations.java
+++ b/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabCalculations.java
@@ -1,28 +1,28 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of AppleScabModel.
  * AppleScabModel is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
  * later version.
  * 
  * AppleScabModel is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
-package no.bioforsk.vips.model.applescabmodel;
+package no.nibio.vips.model.applescabmodel;
 
-import no.bioforsk.vips.util.DateMap;
+import no.nibio.vips.util.DateMap;
 
 /**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class AppleScabCalculations extends DateMap{
     public final static String AGGREGATED_TEMPERATURE = "TMD";
diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java b/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java
similarity index 93%
rename from src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java
rename to src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java
index 422fc890659bf7f36a8868771d4877a0b8233ab6..8edf2ee8d44989cc7be6f109fee857dc61ac4d80 100644
--- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java
+++ b/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java
@@ -1,22 +1,22 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of AppleScabModel.
  * AppleScabModel is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
  * later version.
  * 
  * AppleScabModel is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
-package no.bioforsk.vips.model.applescabmodel;
+package no.nibio.vips.model.applescabmodel;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -28,27 +28,27 @@ import java.util.List;
 import java.util.TimeZone;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.ResultImpl;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.i18n.I18nImpl;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.Model;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.model.ModelId;
-import no.bioforsk.vips.util.CommonNamespaces;
-import no.bioforsk.vips.util.InvalidAggregationTypeException;
-import no.bioforsk.vips.util.WeatherElements;
-import no.bioforsk.vips.util.WeatherObservationListException;
-import no.bioforsk.vips.util.WeatherUtil;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.ResultImpl;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.i18n.I18nImpl;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.Model;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.model.ModelId;
+import no.nibio.vips.util.CommonNamespaces;
+import no.nibio.vips.util.InvalidAggregationTypeException;
+import no.nibio.vips.util.WeatherElements;
+import no.nibio.vips.util.WeatherObservationListException;
+import no.nibio.vips.util.WeatherUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 
 /**
  * This model is based on the old one in VIPS
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class AppleScabModel extends I18nImpl implements Model{
     
@@ -102,7 +102,7 @@ public class AppleScabModel extends I18nImpl implements Model{
     public AppleScabModel()
     {
         // Setting the file name of the resource bundle
-        super("no.bioforsk.vips.model.applescabmodel.texts");
+        super("no.nibio.vips.model.applescabmodel.texts");
         this.weatherUtil = new WeatherUtil();
     }
 
@@ -261,7 +261,7 @@ public class AppleScabModel extends I18nImpl implements Model{
      * <ul>
      * <li>startDateAscosporeMaturity {@see java.util.Date} - the date from which to start calculating ascospore maturity</li>
      * <li>timeZone {@see java.lang.String}</li> - Id for timezone in which you want to work
-     * <li>observations {@see java.util.List} of {@see no.bioforsk.vips.entity.WeatherObservation}</li>
+     * <li>observations {@see java.util.List} of {@see no.nibio.vips.entity.WeatherObservation}</li>
      * 
      * </ul>
      * 
@@ -614,26 +614,26 @@ public class AppleScabModel extends I18nImpl implements Model{
 
     @Override
     public String getLicense() {
-        return "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. \n" +
+        return "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
             "\n" +
             "This file is part of AppleScabModel. \n" + 
             "AppleScabModel is free software: you can redistribute it and/or modify \n" + 
-            "it under the terms of the Bioforsk Open Source License as published by \n" + 
-            "Bioforsk, either version 1 of the License, or (at your option) any \n" +
+            "it under the terms of the NIBIO Open Source License as published by \n" + 
+            "NIBIO, either version 1 of the License, or (at your option) any \n" +
             "later version. \n" +
             "\n" +
             "AppleScabModel is distributed in the hope that it will be useful, \n" +
             "but WITHOUT ANY WARRANTY; without even the implied warranty of \n" +
             "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n" +
-            "Bioforsk Open Source License for more details. \n" +
+            "NIBIO Open Source License for more details. \n" +
             "" +
-            "You should have received a copy of the Bioforsk Open Source License \n" +
-            "along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>. \n";
+            "You should have received a copy of the NIBIO Open Source License \n" +
+            "along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>. \n";
     }
 
     @Override
     public String getCopyright() {
-        return "(c) 2014 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no";
+        return "(c) 2014 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
     }
     
     @Override
diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.java b/src/main/java/no/nibio/vips/model/applescabmodel/AscosporeMaturityTable.java
similarity index 83%
rename from src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.java
rename to src/main/java/no/nibio/vips/model/applescabmodel/AscosporeMaturityTable.java
index 9f87341d96f7dba62fc9f3ad8d9d343c442cd0ae..c11ea3f967337191cda29b612b0db52370f81245 100644
--- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.java
+++ b/src/main/java/no/nibio/vips/model/applescabmodel/AscosporeMaturityTable.java
@@ -1,30 +1,30 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of AppleScabModel.
  * AppleScabModel is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
  * later version.
  * 
  * AppleScabModel is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
-package no.bioforsk.vips.model.applescabmodel;
+package no.nibio.vips.model.applescabmodel;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class AscosporeMaturityTable {
     private static final Map<Double, Double> maturityTable;
@@ -60,7 +60,7 @@ public class AscosporeMaturityTable {
     static {
         Map<Double, Double> aMap = new HashMap();
         /**
-         * These were generated from Bioforsk's VIPS database from this query:
+         * These were generated from NIBIO's VIPS database from this query:
          * SELECT 'aMap.put(' || temperatur ||  'd,' || akkumulert_sporemodning || 'd);' FROM askosporemodning;
          */
         aMap.put(0d,1d);
diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.java b/src/main/java/no/nibio/vips/model/applescabmodel/MillsTable.java
similarity index 86%
rename from src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.java
rename to src/main/java/no/nibio/vips/model/applescabmodel/MillsTable.java
index 9e18dac97e73014f5b941a844f93126b7cd7ec7c..2a4e30813aac095942eddece2462acac36bd2ab4 100644
--- a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.java
+++ b/src/main/java/no/nibio/vips/model/applescabmodel/MillsTable.java
@@ -1,30 +1,30 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of AppleScabModel.
  * AppleScabModel is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
  * later version.
  * 
  * AppleScabModel is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
-package no.bioforsk.vips.model.applescabmodel;
+package no.nibio.vips.model.applescabmodel;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class MillsTable {
     
@@ -39,7 +39,7 @@ public class MillsTable {
     static {
         Map<MillsTableKey, Double> aMap = new HashMap();
         /**
-         * These were generated from Bioforsk's VIPS database from this query:
+         * These were generated from NIBIO's VIPS database from this query:
          * SELECT 'aMap.put(new MillsTableKey(' || temperatur ||  'd,' || type ||  '),' || mills_verdi ||  'd);' FROM mills_tabell;
          */
         aMap.put(new MillsTableKey(0d,1),2d);
diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.java b/src/main/java/no/nibio/vips/model/applescabmodel/MillsTableKey.java
similarity index 70%
rename from src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.java
rename to src/main/java/no/nibio/vips/model/applescabmodel/MillsTableKey.java
index fdc1224146eed67550cfaf9075beb9692715f977..cfdc185d07f96079bd9176807a4bc3479edd6c7c 100644
--- a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.java
+++ b/src/main/java/no/nibio/vips/model/applescabmodel/MillsTableKey.java
@@ -1,29 +1,29 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of AppleScabModel.
  * AppleScabModel is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
  * later version.
  * 
  * AppleScabModel is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
-package no.bioforsk.vips.model.applescabmodel;
+package no.nibio.vips.model.applescabmodel;
 
 import java.util.Objects;
 
 /**
  * Composite key for the map in {@see MillsTable}
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class MillsTableKey {
     private Double temperature;
diff --git a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties b/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties
deleted file mode 100644
index 6b2b49b237142b659f1b46917319b569f0769147..0000000000000000000000000000000000000000
--- a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
-# 
-# This file is part of AppleScabModel.
-# AppleScabModel is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
-# later version.
-# 
-# AppleScabModel is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
-# 
-# You should have received a copy of the Bioforsk Open Source License
-# along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
-# 
-
-
-name=Epleskurvmodell
-usage=F\u00f8lgende inputdata kreves:\nstartDateAscosporeMaturity - Datoen for n\u00e5r man skal starte beregningen av askosporemodning. Sammenfaller normalt med dato for "Gr\u00f8nn spiss" (se beskrivelse)\ntimeZone - Hvilken tidssone man befinner seg i. Viktig for \u00e5 beregne d\u00f8gnverdier (midnatt-til-midnatt). I Norge bruker man prim\u00e6rt "Europe/Oslo". For liste over tidssoner, se her: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones \nobservations - Liste med m\u00e5ledata. F\u00f8lgende parametre kreves:\n* TM - Gjennomsnittstemperatur (Grader Celcius)\n* BT - bladfukt (Minutter pr. time) HVIS du ikke har bladfukt, m\u00e5 du levere UM (relativ luftfuktighet). Da vil vi beregne bladfukt.\n* RR - nedb\u00f8r (mm)\nDette m\u00e5 alle v\u00e6re timedata, og det m\u00e5 v\u00e6re komplette timeserier i samme tidsperiode.\nstartDateAscosporeMaturity m\u00e5 naturligvis falle innenfor perioden hvor man har m\u00e5ledata.
-description=<H2><A name=epleskurv>Epleskurv </A></H2>\n\n<H4>\n<table cellspacing="4" cellpadding="0">\n<tr>\n\t<td width="110">Kontaktpersoner:</td>\n\t<td><i> H\u00e5vard Eikemo <A HREF="mailto:haavard.eikemo@bioforsk.no">haavard.eikemo@bioforsk.no</A></i></td>\n</tr>\n<tr>\n\t<td width="110"></td>\n\t<td><i>Arne Stensvand <A HREF="mailto:arne.stensvand">arne.stensvand@bioforsk.no</A></i></td>\n</tr>\n</table>\n</H4>\n\n<H3><A name=millstabell>Infeksjon (Mills' tabell) </A></h3>\n\n\n<P class=Normal>Det m\u00e5 v\u00e6re fuktighet p\u00e5 blad, skudd eller frukter i et visst\ntemperaturavhenging tidsrom for at sporene til skurvsoppen skal kunne infisere.\nInfeksjonstabellen, ofte kalt Mills' tabell, sier hvor lang fuktighetsperioden\nm\u00e5 v\u00e6re ved ulike temperaturer for at infeksjon skal kunne skje. Ved optimal\ntemperatur, rundt 20 \u00b0C, er denne perioden p\u00e5 6 timer for askosporer.\n<br><br>\nInfeksjonsfaren blir uttrykt ved hjelp av en akkumulert verdi - i form av et tall st\u00f8rre enn null. Tallet \u00f8ker for hver time med bladfukt. N\u00e5r tallet for infeksjonsfare passerer 90, presenteres varselindikatoren som en gul firkant (mulig fare). N\u00e5r tallet passerer 100, presenteres en r\u00f8d firkant - som symbol for infeksjonsfare.\n<br><br>\n7 timer sammenhengende med bladfukt mindre enn 20 min/time vil nullstille tallet for infeksjonsfare fra og med 8.time. \n<br><br>\nSkurvvarslene er et viktig hjelpemiddel for dyrkerne til \u00e5 optimalisere\nspr\u00f8ytetidspunktene. Spr\u00f8yting etter skurvvarsel forutsetter at en har tilgang\ntil effektive kurative soppmidler. </P>\n\n<H3><A name=millssesongoppstart>Sesongoppstart </A></H3>\n\n<P class=Normal>Dato for sesongoppstart vil som regel samsvare med tidspunktet for n\u00e5r 50 % av blomsterknoppene hos tidligblomstrende eplesorter som Gravenstein og Summerred er p\u00e5 stadiet "gr\u00f8nn spiss". P\u00e5 dette tidspunktet vil vanligvis ogs\u00e5 de f\u00f8rste askosporene til skurvsoppen v\u00e6re modne og klare til kasting. Datoen vil normalt variere litt fra distrikt til distrikt. </P>\n\n<H3><A name=millsvarseltolking>Tolking av varsel </A></H3>\n\n<P class=Normal>Varslene beregnes med grunnlag i m\u00e5linger av bladfuktighet og temperatur p\u00e5 en rekke automatiske klimastasjoner. Varslene blir oppdatert hver time p\u00e5 dagtid i vekstsesongen. Gr\u00f8nn farge betyr at det ikke har v\u00e6rt forhold for epleskurvinfeksjon gjeldende dag. Gul  farge indikerer at det kan forventes et skurvvarsel i l\u00f8pet av de n\u00e6rmeste timene dersom klimastasjonen fortsetter \u00e5 registrere bladfuktighet. Varselsymbol med r\u00f8d farge viser at det har v\u00e6rt forhold for skurvinfeksjon gjeldende dag. Klokkeslettet angir n\u00e5r de\nf\u00f8rste sporene antas \u00e5 ha infisert. Ved kontinuerlig r\u00f8dt varsel over flere dager, vil det ikke bli satt inn noe nytt klokkeslett de p\u00e5f\u00f8lgende\ndagene.</p><BR>\n<IMG  src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/varseldetaljer600.jpg" alt="Tolking av varsel om fare for epleskurv" border="0">\n<i>Presentasjon varsel om epleskurv i VIPS </i> <br>\n\n<P class=Normal>\nNedenfor f\u00f8lger kolonneoverskrifter og forklaring til presentasjon av epleskurvvarsler:</p>\n\n<table class ="RuteTabell1" >\n<caption align="top">Tabell 1. Forklaring til presentasjon av epleskurvvarsler.<br></caption >\n    \n    <tr bgcolor="#cbd0d3">\n      <th class="kursiv">Kolonneoverskrift</th>\n      <th class="kursiv">Forklaring</th>\n    </tr>\n    <tr>\n      <td class="normal">TM:</td>\n      <td class="normal">Middeltemperatur for foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal">BF:</td>\n      <td class="normal">Bladfuktighet, minutter i l\u00f8pet av foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal" >RR:</td>\n      <td class="normal" >Nedb\u00f8r, i mm for foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal" >%Sp.mod:</td>\n      <td class="normal" >% Sporemodning etter Gadoury &amp; MacHardy's modell (se eget avsnitt)</td>\n    </tr>\n    <tr>\n      <td class="normal" >Stadium:</td>\n      <td class="normal" >Skurvsoppens utviklingsstadium(askosporer eller konidier)</td>\n    </tr>\n    <tr>\n      <td class="normal" >Verdi</td>\n      <td class="normal" >Tilvekst av infeksjonsfare for foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal" >Inf.fare:</td>\n      <td class="normal" >Akkumulert infeksjonsfare</td>\n    </tr>    \n      <tr>\n      <td class="normal" >Status:</td>\n      <td class="normal" >Varsel om infeksjonsfare(gr\u00f8nt, gult eller r\u00f8dt rektangel)</td>\n    </tr>    \n\n</table>\n\n<H3><A name=gadoury>Sporemodning (Gadoury &amp; MacHardy) </A></H3>\n\n<P class=Normal>I USA er det utarbeidet en modell for askosporemodning som er\ntilpasset norske forhold. Modningen er en funksjon av akkumulert varmesum (sum\ngraddager [d\u00f8gngrader]) fra en bestemt startdato (= n\u00e5r de f\u00f8rste sporene er modne) og\nberegner lengden av tidsrommet for n\u00e5r det fare for prim\u00e6rinfeksjoner. Ved lange perioder uten nedb\u00f8r eller langvarig nattedogg (mer enn 7 dager) vil akkumuleringen av d\u00f8gngrader bli stanset. D\u00f8gngradeakkumuleringen vil starte igjen s\u00e5 snart det kommer nedb\u00f8r. Mange eller lange perioder uten nedb\u00f8r vil f\u00f8re til en forlenging av prim\u00e6rsesongen (infeksjon av askosporer). </P>\n\n<img src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/sporemodning.jpg" alt="Sporemodning for epleskurv">\n<p>Graf som viser sporemodning.</p>\n\n<H3><A name=gadourysesongoppstart>Sesongoppstart </A></H3>\n\n<P class=Normal>Dato for sesongoppstart vil som regel samsvare med tidspunktet\nfor n\u00e5r 50 % av blomsterknoppene hos tidligblomstrende eplesorter som\nGravenstein og Summerred er p\u00e5 stadiet "gr\u00f8nn spiss". P\u00e5 dette tidspunktet vil\nvanligvis de f\u00f8rste sporene til skurvsoppen v\u00e6re modne og klare til kasting.\nSporemodningen blir ogs\u00e5 fulgt ved hjelp av mikroskopiske unders\u00f8kelser ved\nBioforsk Plantehelse p\u00e5 \u00c5s. Startdatoen vil normalt v\u00e6re forskjellig fra\ndistrikt til distrikt. </P>\n\n<H3><A name=gadouryvarseltolking>Tolking av varsel </A></H3>\n\n<P class=Normal>Beregningene skjer p\u00e5 grunnlag av temperatur og bladfuktighet m\u00e5lt p\u00e5 automatiske klimastasjoner. Varslene blir normalt oppdatert hver time mellom kl 0700 og 2300. Tallene i kolonnen <i>%Sp.mod</i> i tabellen viser prosent akkumulert sporemodning. Akkumulering av verdien for sporemodning stanses i t\u00f8rre perioder, dvs perioder p\u00e5 mer enn 4 dager uten nedb\u00f8r eller langvarig nattedogg. N\u00e5r verdien n\u00e6rmer seg 100 % vil det v\u00e6re minimalt med askosporer igjen i gammelt bladverk p\u00e5 bakken, og faren for nye prim\u00e6rinfeksjoner vil da v\u00e6re liten. </P>\n\n<IMG src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/Epleskurv1.jpg" width="400" height="300" alt="Skurv p\u00e5 undersiden av et epleblad"/>\n<p>Skurv p\u00e5 undersiden av et epleblad. <i>Foto: Dag R\u00f8en</i></p>\n<p> </p>\n\n<IMG src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/Epleskurv2.jpg" width="400" height="300" alt="Skurv p\u00e5 frukt">\n<p>Skurv p\u00e5 frukt. <i>Foto: Dag R\u00f8en</i></p>
diff --git a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties b/src/main/resources/no/nibio/vips/model/applescabmodel/texts.properties
similarity index 76%
rename from src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties
rename to src/main/resources/no/nibio/vips/model/applescabmodel/texts.properties
index 1efbf2049214b17dc1e62c6c0d142e5e1d6a77e7..62b46d0262703e340ca65d43445ee031a8e1d9ae 100644
--- a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties
+++ b/src/main/resources/no/nibio/vips/model/applescabmodel/texts.properties
@@ -1,18 +1,18 @@
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of AppleScabModel.
 # AppleScabModel is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # AppleScabModel is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 # 
-# You should have received a copy of the Bioforsk Open Source License
-# along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 name=Apple Scab Model
diff --git a/src/main/resources/no/nibio/vips/model/applescabmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/applescabmodel/texts_nb.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a852fd7ebead57b6264a8c97e68cd085afd734d7
--- /dev/null
+++ b/src/main/resources/no/nibio/vips/model/applescabmodel/texts_nb.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
+# 
+# This file is part of AppleScabModel.
+# AppleScabModel is free software: you can redistribute it and/or modify
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
+# later version.
+# 
+# AppleScabModel is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# NIBIO Open Source License for more details.
+# 
+# You should have received a copy of the NIBIO Open Source License
+# along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
+# 
+
+
+name=Epleskurvmodell
+usage=F\u00f8lgende inputdata kreves:\nstartDateAscosporeMaturity - Datoen for n\u00e5r man skal starte beregningen av askosporemodning. Sammenfaller normalt med dato for "Gr\u00f8nn spiss" (se beskrivelse)\ntimeZone - Hvilken tidssone man befinner seg i. Viktig for \u00e5 beregne d\u00f8gnverdier (midnatt-til-midnatt). I Norge bruker man prim\u00e6rt "Europe/Oslo". For liste over tidssoner, se her: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones \nobservations - Liste med m\u00e5ledata. F\u00f8lgende parametre kreves:\n* TM - Gjennomsnittstemperatur (Grader Celcius)\n* BT - bladfukt (Minutter pr. time) HVIS du ikke har bladfukt, m\u00e5 du levere UM (relativ luftfuktighet). Da vil vi beregne bladfukt.\n* RR - nedb\u00f8r (mm)\nDette m\u00e5 alle v\u00e6re timedata, og det m\u00e5 v\u00e6re komplette timeserier i samme tidsperiode.\nstartDateAscosporeMaturity m\u00e5 naturligvis falle innenfor perioden hvor man har m\u00e5ledata.
+description=<H2><A name=epleskurv>Epleskurv </A></H2>\n\n<H4>\n<table cellspacing="4" cellpadding="0">\n<tr>\n\t<td width="110">Kontaktpersoner:</td>\n\t<td><i> H\u00e5vard Eikemo <A HREF="mailto:haavard.eikemo@nibio.no">haavard.eikemo@nibio.no</A></i></td>\n</tr>\n<tr>\n\t<td width="110"></td>\n\t<td><i>Arne Stensvand <A HREF="mailto:arne.stensvand">arne.stensvand@nibio.no</A></i></td>\n</tr>\n</table>\n</H4>\n\n<H3><A name=millstabell>Infeksjon (Mills' tabell) </A></h3>\n\n\n<P class=Normal>Det m\u00e5 v\u00e6re fuktighet p\u00e5 blad, skudd eller frukter i et visst\ntemperaturavhenging tidsrom for at sporene til skurvsoppen skal kunne infisere.\nInfeksjonstabellen, ofte kalt Mills' tabell, sier hvor lang fuktighetsperioden\nm\u00e5 v\u00e6re ved ulike temperaturer for at infeksjon skal kunne skje. Ved optimal\ntemperatur, rundt 20 \u00b0C, er denne perioden p\u00e5 6 timer for askosporer.\n<br><br>\nInfeksjonsfaren blir uttrykt ved hjelp av en akkumulert verdi - i form av et tall st\u00f8rre enn null. Tallet \u00f8ker for hver time med bladfukt. N\u00e5r tallet for infeksjonsfare passerer 90, presenteres varselindikatoren som en gul firkant (mulig fare). N\u00e5r tallet passerer 100, presenteres en r\u00f8d firkant - som symbol for infeksjonsfare.\n<br><br>\n7 timer sammenhengende med bladfukt mindre enn 20 min/time vil nullstille tallet for infeksjonsfare fra og med 8.time. \n<br><br>\nSkurvvarslene er et viktig hjelpemiddel for dyrkerne til \u00e5 optimalisere\nspr\u00f8ytetidspunktene. Spr\u00f8yting etter skurvvarsel forutsetter at en har tilgang\ntil effektive kurative soppmidler. </P>\n\n<H3><A name=millssesongoppstart>Sesongoppstart </A></H3>\n\n<P class=Normal>Dato for sesongoppstart vil som regel samsvare med tidspunktet for n\u00e5r 50 % av blomsterknoppene hos tidligblomstrende eplesorter som Gravenstein og Summerred er p\u00e5 stadiet "gr\u00f8nn spiss". P\u00e5 dette tidspunktet vil vanligvis ogs\u00e5 de f\u00f8rste askosporene til skurvsoppen v\u00e6re modne og klare til kasting. Datoen vil normalt variere litt fra distrikt til distrikt. </P>\n\n<H3><A name=millsvarseltolking>Tolking av varsel </A></H3>\n\n<P class=Normal>Varslene beregnes med grunnlag i m\u00e5linger av bladfuktighet og temperatur p\u00e5 en rekke automatiske klimastasjoner. Varslene blir oppdatert hver time p\u00e5 dagtid i vekstsesongen. Gr\u00f8nn farge betyr at det ikke har v\u00e6rt forhold for epleskurvinfeksjon gjeldende dag. Gul  farge indikerer at det kan forventes et skurvvarsel i l\u00f8pet av de n\u00e6rmeste timene dersom klimastasjonen fortsetter \u00e5 registrere bladfuktighet. Varselsymbol med r\u00f8d farge viser at det har v\u00e6rt forhold for skurvinfeksjon gjeldende dag. Klokkeslettet angir n\u00e5r de\nf\u00f8rste sporene antas \u00e5 ha infisert. Ved kontinuerlig r\u00f8dt varsel over flere dager, vil det ikke bli satt inn noe nytt klokkeslett de p\u00e5f\u00f8lgende\ndagene.</p><BR>\n<IMG  src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/varseldetaljer600.jpg" alt="Tolking av varsel om fare for epleskurv" border="0">\n<i>Presentasjon varsel om epleskurv i VIPS </i> <br>\n\n<P class=Normal>\nNedenfor f\u00f8lger kolonneoverskrifter og forklaring til presentasjon av epleskurvvarsler:</p>\n\n<table class ="RuteTabell1" >\n<caption align="top">Tabell 1. Forklaring til presentasjon av epleskurvvarsler.<br></caption >\n    \n    <tr bgcolor="#cbd0d3">\n      <th class="kursiv">Kolonneoverskrift</th>\n      <th class="kursiv">Forklaring</th>\n    </tr>\n    <tr>\n      <td class="normal">TM:</td>\n      <td class="normal">Middeltemperatur for foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal">BF:</td>\n      <td class="normal">Bladfuktighet, minutter i l\u00f8pet av foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal" >RR:</td>\n      <td class="normal" >Nedb\u00f8r, i mm for foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal" >%Sp.mod:</td>\n      <td class="normal" >% Sporemodning etter Gadoury &amp; MacHardy's modell (se eget avsnitt)</td>\n    </tr>\n    <tr>\n      <td class="normal" >Stadium:</td>\n      <td class="normal" >Skurvsoppens utviklingsstadium(askosporer eller konidier)</td>\n    </tr>\n    <tr>\n      <td class="normal" >Verdi</td>\n      <td class="normal" >Tilvekst av infeksjonsfare for foreg\u00e5ende time</td>\n    </tr>\n    <tr>\n      <td class="normal" >Inf.fare:</td>\n      <td class="normal" >Akkumulert infeksjonsfare</td>\n    </tr>    \n      <tr>\n      <td class="normal" >Status:</td>\n      <td class="normal" >Varsel om infeksjonsfare(gr\u00f8nt, gult eller r\u00f8dt rektangel)</td>\n    </tr>    \n\n</table>\n\n<H3><A name=gadoury>Sporemodning (Gadoury &amp; MacHardy) </A></H3>\n\n<P class=Normal>I USA er det utarbeidet en modell for askosporemodning som er\ntilpasset norske forhold. Modningen er en funksjon av akkumulert varmesum (sum\ngraddager [d\u00f8gngrader]) fra en bestemt startdato (= n\u00e5r de f\u00f8rste sporene er modne) og\nberegner lengden av tidsrommet for n\u00e5r det fare for prim\u00e6rinfeksjoner. Ved lange perioder uten nedb\u00f8r eller langvarig nattedogg (mer enn 7 dager) vil akkumuleringen av d\u00f8gngrader bli stanset. D\u00f8gngradeakkumuleringen vil starte igjen s\u00e5 snart det kommer nedb\u00f8r. Mange eller lange perioder uten nedb\u00f8r vil f\u00f8re til en forlenging av prim\u00e6rsesongen (infeksjon av askosporer). </P>\n\n<img src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/sporemodning.jpg" alt="Sporemodning for epleskurv">\n<p>Graf som viser sporemodning.</p>\n\n<H3><A name=gadourysesongoppstart>Sesongoppstart </A></H3>\n\n<P class=Normal>Dato for sesongoppstart vil som regel samsvare med tidspunktet\nfor n\u00e5r 50 % av blomsterknoppene hos tidligblomstrende eplesorter som\nGravenstein og Summerred er p\u00e5 stadiet "gr\u00f8nn spiss". P\u00e5 dette tidspunktet vil\nvanligvis de f\u00f8rste sporene til skurvsoppen v\u00e6re modne og klare til kasting.\nSporemodningen blir ogs\u00e5 fulgt ved hjelp av mikroskopiske unders\u00f8kelser ved\nNIBIO Plantehelse p\u00e5 \u00c5s. Startdatoen vil normalt v\u00e6re forskjellig fra\ndistrikt til distrikt. </P>\n\n<H3><A name=gadouryvarseltolking>Tolking av varsel </A></H3>\n\n<P class=Normal>Beregningene skjer p\u00e5 grunnlag av temperatur og bladfuktighet m\u00e5lt p\u00e5 automatiske klimastasjoner. Varslene blir normalt oppdatert hver time mellom kl 0700 og 2300. Tallene i kolonnen <i>%Sp.mod</i> i tabellen viser prosent akkumulert sporemodning. Akkumulering av verdien for sporemodning stanses i t\u00f8rre perioder, dvs perioder p\u00e5 mer enn 4 dager uten nedb\u00f8r eller langvarig nattedogg. N\u00e5r verdien n\u00e6rmer seg 100 % vil det v\u00e6re minimalt med askosporer igjen i gammelt bladverk p\u00e5 bakken, og faren for nye prim\u00e6rinfeksjoner vil da v\u00e6re liten. </P>\n\n<IMG src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/Epleskurv1.jpg" width="400" height="300" alt="Skurv p\u00e5 undersiden av et epleblad"/>\n<p>Skurv p\u00e5 undersiden av et epleblad. <i>Foto: Dag R\u00f8en</i></p>\n<p> </p>\n\n<IMG src="http://www.vips-landbruk.no/redaksjonelt/informasjon/bilder/Epleskurv2.jpg" width="400" height="300" alt="Skurv p\u00e5 frukt">\n<p>Skurv p\u00e5 frukt. <i>Foto: Dag R\u00f8en</i></p>
diff --git a/src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java b/src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java
similarity index 93%
rename from src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java
rename to src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java
index e05c8b4add21d1150a26febba0535a71774bb2e8..cd000d29f88ac6a1608fbcb18b6d75986cfb107c 100644
--- a/src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java
+++ b/src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java
@@ -1,24 +1,27 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of AppleScabModel.
  * AppleScabModel is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
  * later version.
  * 
  * AppleScabModel is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with AppleScabModel.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.model.applescabmodel;
+package no.nibio.vips.model.applescabmodel;
 
+import no.nibio.vips.model.applescabmodel.AppleScabCalculations;
+import no.nibio.vips.model.applescabmodel.MillsTable;
+import no.nibio.vips.model.applescabmodel.AppleScabModel;
 import com.fasterxml.jackson.core.JsonFactory;
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -35,13 +38,13 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
 import junit.framework.Test;
 import junit.framework.TestCase;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.util.CommonNamespaces;
-import no.bioforsk.vips.util.WeatherObservationListException;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.util.CommonNamespaces;
+import no.nibio.vips.util.WeatherObservationListException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.MappingJsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;