diff --git a/Project.toml b/Project.toml
index e2611994126fcf45d40f68f850e6c14068ac0d74..23bc614b01a86436e4df58fffcb5921236a4e8a8 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "Persefone"
 uuid = "039acd1d-2a07-4b33-b082-83a1ff0fd136"
 authors = ["Daniel Vedder <daniel.vedder@idiv.de>"]
-version = "0.3.2"
+version = "0.3.3"
 
 [deps]
 Agents = "46ada45e-f475-11e8-01d0-f70cc89e6671"
diff --git a/data/almass_crop_growth_curves.csv b/data/crops/almass/almass_crop_growth_curves.csv
similarity index 100%
rename from data/almass_crop_growth_curves.csv
rename to data/crops/almass/almass_crop_growth_curves.csv
diff --git a/data/almass_crop_growth_curves.pre b/data/crops/almass/almass_crop_growth_curves.pre
similarity index 100%
rename from data/almass_crop_growth_curves.pre
rename to data/crops/almass/almass_crop_growth_curves.pre
diff --git a/data/convert_almass_data.py b/data/crops/almass/convert_almass_data.py
similarity index 100%
rename from data/convert_almass_data.py
rename to data/crops/almass/convert_almass_data.py
diff --git a/data/crop_data_general.csv b/data/crops/almass/crop_data_general.csv
similarity index 100%
rename from data/crop_data_general.csv
rename to data/crops/almass/crop_data_general.csv
diff --git a/data/extract_weather_data.R b/data/regions/extract_weather_data.R
similarity index 100%
rename from data/extract_weather_data.R
rename to data/regions/extract_weather_data.R
diff --git a/data/landcover_hohenlohe.tif b/data/regions/hohenlohe/landcover.tif
similarity index 100%
rename from data/landcover_hohenlohe.tif
rename to data/regions/hohenlohe/landcover.tif
diff --git a/data/fields_jena.tif b/data/regions/jena/fields.tif
similarity index 100%
rename from data/fields_jena.tif
rename to data/regions/jena/fields.tif
diff --git a/data/landcover_jena.tif b/data/regions/jena/landcover.tif
similarity index 100%
rename from data/landcover_jena.tif
rename to data/regions/jena/landcover.tif
diff --git a/data/weather_jena.csv b/data/regions/jena/weather.csv
similarity index 100%
rename from data/weather_jena.csv
rename to data/regions/jena/weather.csv
diff --git a/data/fields_thueringer_becken.tif b/data/regions/thueringer_becken/fields.tif
similarity index 100%
rename from data/fields_thueringer_becken.tif
rename to data/regions/thueringer_becken/fields.tif
diff --git a/data/landcover_thueringer_becken.tif b/data/regions/thueringer_becken/landcover.tif
similarity index 100%
rename from data/landcover_thueringer_becken.tif
rename to data/regions/thueringer_becken/landcover.tif
diff --git a/src/core/simulation.jl b/src/core/simulation.jl
index 81d931aee154a50acc1aeae056de0a62f52140e8..8e2ef2d9c38f7cac308bcbe95c3acd1a8184fad2 100644
--- a/src/core/simulation.jl
+++ b/src/core/simulation.jl
@@ -88,6 +88,7 @@ function initmodel(settings::Dict{String, Any})
         initfields!(model)
         initfarms!(model)
         initnature!(model)
+        #outputdata(model) #XXX record data before run starts?
         model
     end
 end
diff --git a/src/parameters.toml b/src/parameters.toml
index 79bba3e3d1784cf8a903b24819f0bbe88022d0f1..80d845fa127b4a66d754c160dbb0065b8cef7ad9 100644
--- a/src/parameters.toml
+++ b/src/parameters.toml
@@ -18,13 +18,12 @@ processors = 2 # number of processors to use on parallel runs
 seed = 2 # seed value for the RNG (0 -> random value)
 # dates to start and end the simulation
 startdate = 2022-01-01
-#enddate = 2022-03-31
 enddate = 2022-12-31
 
 [world]
-landcovermap = "data/landcover_jena.tif" # location of the landcover map
-farmfieldsmap = "data/fields_jena.tif" # location of the field geometry map
-weatherfile = "data/weather_jena.csv" # location of the weather data file
+landcovermap = "data/regions/jena/landcover.tif" # location of the landcover map
+farmfieldsmap = "data/regions/jena/fields.tif" # location of the field geometry map
+weatherfile = "data/regions/jena/weather.csv" # location of the weather data file
 	
 [farm]
 farmmodel = "FieldManager" # which version of the farm model to use (not yet implemented)
@@ -37,6 +36,6 @@ insectmodel = ["season", "habitat", "pesticides", "weather"] # factors affecting
 	
 [crop]
 cropmodel = "almass" # crop growth model to use, "almass" or "aquacrop"
-cropfile = "data/crop_data_general.csv" # file with general crop parameters
-growthfile = "data/almass_crop_growth_curves.csv" # file with crop growth parameters	
+cropfile = "data/crops/almass/crop_data_general.csv" # file with general crop parameters
+growthfile = "data/crops/almass/almass_crop_growth_curves.csv" # file with crop growth parameters