diff --git a/CMakeLists.txt b/CMakeLists.txt
index 718ce4c10bc5f471a351fdaef93943c528bb3393..fe0ae588b145c736b8639d159203e7ac0a15bc8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,4 +142,16 @@ add_custom_command(
         TARGET obl POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
         ${CMAKE_SOURCE_DIR}/PAPA_06_2017/
-        ${CMAKE_CURRENT_BINARY_DIR}/PAPA_06_2017/)
\ No newline at end of file
+        ${CMAKE_CURRENT_BINARY_DIR}/PAPA_06_2017/)
+
+add_custom_command(
+        TARGET obl POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_SOURCE_DIR}/meteo-init/
+        ${CMAKE_CURRENT_BINARY_DIR}/meteo-init/)
+
+add_custom_command(
+        TARGET obl POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_SOURCE_DIR}/meteo-forcing/
+        ${CMAKE_CURRENT_BINARY_DIR}/meteo-forcing/)
diff --git a/meteo-forcing/papa-2017/LW-down.dat b/meteo-forcing/papa-2017-june/LW-down.dat
similarity index 100%
rename from meteo-forcing/papa-2017/LW-down.dat
rename to meteo-forcing/papa-2017-june/LW-down.dat
diff --git a/meteo-forcing/papa-2017/Pair.dat b/meteo-forcing/papa-2017-june/Pair.dat
similarity index 100%
rename from meteo-forcing/papa-2017/Pair.dat
rename to meteo-forcing/papa-2017-june/Pair.dat
diff --git a/meteo-forcing/papa-2017/RHair.dat b/meteo-forcing/papa-2017-june/RHair.dat
similarity index 100%
rename from meteo-forcing/papa-2017/RHair.dat
rename to meteo-forcing/papa-2017-june/RHair.dat
diff --git a/meteo-forcing/papa-2017/Readme.txt b/meteo-forcing/papa-2017-june/Readme.txt
similarity index 100%
rename from meteo-forcing/papa-2017/Readme.txt
rename to meteo-forcing/papa-2017-june/Readme.txt
diff --git a/meteo-forcing/papa-2017/SW-down.dat b/meteo-forcing/papa-2017-june/SW-down.dat
similarity index 100%
rename from meteo-forcing/papa-2017/SW-down.dat
rename to meteo-forcing/papa-2017-june/SW-down.dat
diff --git a/meteo-forcing/papa-2017/Tair.dat b/meteo-forcing/papa-2017-june/Tair.dat
similarity index 100%
rename from meteo-forcing/papa-2017/Tair.dat
rename to meteo-forcing/papa-2017-june/Tair.dat
diff --git a/meteo-forcing/papa-2017/latent_hflux.dat b/meteo-forcing/papa-2017-june/latent_hflux.dat
similarity index 100%
rename from meteo-forcing/papa-2017/latent_hflux.dat
rename to meteo-forcing/papa-2017-june/latent_hflux.dat
diff --git a/meteo-forcing/papa-2017/sensible_hflux.dat b/meteo-forcing/papa-2017-june/sensible_hflux.dat
similarity index 100%
rename from meteo-forcing/papa-2017/sensible_hflux.dat
rename to meteo-forcing/papa-2017-june/sensible_hflux.dat
diff --git a/meteo-forcing/papa-2017/tau-x.dat b/meteo-forcing/papa-2017-june/tau-x.dat
similarity index 100%
rename from meteo-forcing/papa-2017/tau-x.dat
rename to meteo-forcing/papa-2017-june/tau-x.dat
diff --git a/meteo-forcing/papa-2017/tau-y.dat b/meteo-forcing/papa-2017-june/tau-y.dat
similarity index 100%
rename from meteo-forcing/papa-2017/tau-y.dat
rename to meteo-forcing/papa-2017-june/tau-y.dat
diff --git a/meteo-forcing/papa-2017/u-wind.dat b/meteo-forcing/papa-2017-june/u-wind.dat
similarity index 100%
rename from meteo-forcing/papa-2017/u-wind.dat
rename to meteo-forcing/papa-2017-june/u-wind.dat
diff --git a/meteo-forcing/papa-2017/v-wind.dat b/meteo-forcing/papa-2017-june/v-wind.dat
similarity index 100%
rename from meteo-forcing/papa-2017/v-wind.dat
rename to meteo-forcing/papa-2017-june/v-wind.dat
diff --git a/meteo-init/papa-2017/Readme.txt b/meteo-init/papa-2017-june/Readme.txt
similarity index 100%
rename from meteo-init/papa-2017/Readme.txt
rename to meteo-init/papa-2017-june/Readme.txt
diff --git a/meteo-init/papa-2017/Salin.dat b/meteo-init/papa-2017-june/Salin.dat
similarity index 100%
rename from meteo-init/papa-2017/Salin.dat
rename to meteo-init/papa-2017-june/Salin.dat
diff --git a/meteo-init/papa-2017/Theta.dat b/meteo-init/papa-2017-june/Theta.dat
similarity index 100%
rename from meteo-init/papa-2017/Theta.dat
rename to meteo-init/papa-2017-june/Theta.dat
diff --git a/obl_run_papa_fluxes.f90 b/obl_run_papa_fluxes.f90
index b87911dc67900e1a404b3ab283c677f824e5b139..209944250f252497c829d91853e7cfc8f810fc42 100644
--- a/obl_run_papa_fluxes.f90
+++ b/obl_run_papa_fluxes.f90
@@ -23,10 +23,10 @@ module obl_run_papa_fluxes
     ! --------------------------------------------------------------------------------
 
     ! --------------------------------------------------------------------------------
-    character(len = 256), parameter :: path = 'PAPA_06_2017/'
+    character(len = 256), parameter :: path = 'papa-2017-june/'
     ! --------------------------------------------------------------------------------
     
-    
+
     contains
 
     ! --------------------------------------------------------------------------------
@@ -88,17 +88,17 @@ module obl_run_papa_fluxes
         !< using 'flux' mode
         is_meteo_setup = 0
 
-        call set_external_tforcing(sensible_hflux_surf, trim(path)//'sensible_hflux.dat')
-        call set_external_tforcing(latent_hflux_surf, trim(path)//'latent_hflux.dat')
+        call set_external_tforcing(sensible_hflux_surf, 'meteo-forcing/'//trim(path)//'sensible_hflux.dat')
+        call set_external_tforcing(latent_hflux_surf, 'meteo-forcing/'//trim(path)//'latent_hflux.dat')
 
         call set_const_tforcing(salin_flux_surf, 0.0)
 
-        call set_external_tforcing(tau_x_surf, trim(path)//'tau-x.dat')
-        call set_external_tforcing(tau_y_surf, trim(path)//'tau-y.dat')
+        call set_external_tforcing(tau_x_surf, 'meteo-forcing/'//trim(path)//'tau-x.dat')
+        call set_external_tforcing(tau_y_surf, 'meteo-forcing/'//trim(path)//'tau-y.dat')
 
-        call set_external_tforcing(sw_flux_surf, trim(path)//'SW-down.dat')
+        call set_external_tforcing(sw_flux_surf, 'meteo-forcing/'//trim(path)//'SW-down.dat')
 
-        call set_external_tforcing(lw_in_surf, trim(path)//'LW-down.dat')
+        call set_external_tforcing(lw_in_surf, 'meteo-forcing/'//trim(path)//'LW-down.dat')
 
         !< normalize time in external forcing: hrs -> sec
         call normalize_time_tforcing(sensible_hflux_surf, 3600.0)
@@ -135,8 +135,8 @@ module obl_run_papa_fluxes
         type (gridDataType), intent(in) :: grid
         ! ----------------------------------------------------------------------------
 
-        call set_external_profile(Theta, trim(path)//'Theta.dat', grid)
-        call set_external_profile(Salin, trim(path)//'Salin.dat', grid)
+        call set_external_profile(Theta, 'meteo-init/'//trim(path)//'Theta.dat', grid)
+        call set_external_profile(Salin, 'meteo-init/'//trim(path)//'Salin.dat', grid)
 
         call set_const_profile(U, 0.0, grid)
         call set_const_profile(V, 0.0, grid)
diff --git a/obl_run_papa_meteo.f90 b/obl_run_papa_meteo.f90
index f5f3d150754c4c9b5ac2c77477133334b8bd9f65..bf75cab9e4295e1a039877892e91328d9e004de7 100644
--- a/obl_run_papa_meteo.f90
+++ b/obl_run_papa_meteo.f90
@@ -23,7 +23,7 @@ module obl_run_papa_meteo
     ! --------------------------------------------------------------------------------
 
     ! --------------------------------------------------------------------------------
-    character(len = 256), parameter :: path = 'PAPA_06_2017/'
+    character(len = 256), parameter :: path = 'papa-2017-june/'
     ! --------------------------------------------------------------------------------
 
     
@@ -88,18 +88,18 @@ module obl_run_papa_meteo
         !< using 'meteo' mode
         is_meteo_setup = 1
 
-        call set_external_tforcing(Ua, trim(path)//'u-wind.dat')
-        call set_external_tforcing(Va, trim(path)//'v-wind.dat')
+        call set_external_tforcing(Ua, 'meteo-forcing/'//trim(path)//'u-wind.dat')
+        call set_external_tforcing(Va, 'meteo-forcing/'//trim(path)//'v-wind.dat')
 
         call set_const_tforcing(salin_flux_surf, 0.0)
 
-        call set_external_tforcing(Ta, trim(path)//'Tair.dat')
-        call set_external_tforcing(Pa, trim(path)//'Pair.dat')
-        call set_external_tforcing(RHa, trim(path)//'RHair.dat')
+        call set_external_tforcing(Ta, 'meteo-forcing/'//trim(path)//'Tair.dat')
+        call set_external_tforcing(Pa, 'meteo-forcing/'//trim(path)//'Pair.dat')
+        call set_external_tforcing(RHa, 'meteo-forcing/'//trim(path)//'RHair.dat')
 
-        call set_external_tforcing(sw_flux_surf, trim(path)//'SW-down.dat')
+        call set_external_tforcing(sw_flux_surf, 'meteo-forcing/'//trim(path)//'SW-down.dat')
 
-        call set_external_tforcing(lw_in_surf, trim(path)//'LW-down.dat')
+        call set_external_tforcing(lw_in_surf, 'meteo-forcing/'//trim(path)//'LW-down.dat')
 
         !< normalize time in external forcing: hrs -> sec
         call normalize_time_tforcing(Ua, 3600.0)
@@ -137,8 +137,8 @@ module obl_run_papa_meteo
         type (gridDataType), intent(in) :: grid
         ! ----------------------------------------------------------------------------
 
-        call set_external_profile(Theta, trim(path)//'Theta.dat', grid)
-        call set_external_profile(Salin, trim(path)//'Salin.dat', grid)
+        call set_external_profile(Theta, 'meteo-init/'//trim(path)//'Theta.dat', grid)
+        call set_external_profile(Salin, 'meteo-init/'//trim(path)//'Salin.dat', grid)
 
         call set_const_profile(U, 0.0, grid)
         call set_const_profile(V, 0.0, grid)