diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-1_fon+coord.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_1+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-1_fon+coord.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_1+coord.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-1_fon.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_1.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-1_fon.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_1.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-10_fon+coord.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_10+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-10_fon+coord.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_10+coord.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-10_fon.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_10.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-10_fon.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_10.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-20_fon+coord.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_20+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-20_fon+coord.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_20+coord.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-20_fon.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_20.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-20_fon.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_20.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-40_fon+coord.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_40+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-40_fon+coord.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_40+coord.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-40_fon.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_40.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-40_fon.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_40.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-5_fon+coord.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_5+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-5_fon+coord.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_5+coord.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-5_fon.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_5.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-5_fon.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_5.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-500_fon+coord.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_500+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-500_fon+coord.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_500+coord.agg
diff --git a/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-500_fon.agg b/v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_500.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/2012-06-11_j12_s05-500_fon.agg
rename to v1.3.1/fonera_2.0/s05_j12_fon_2012-06-11/s05_j12_fon_2012-06-11_500.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1024_fon+coord.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1024+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1024_fon+coord.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1024+coord.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1024_fon.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1024.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1024_fon.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1024.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-128_fon+coord.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_128+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-128_fon+coord.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_128+coord.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-128_fon.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_128.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-128_fon.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_128.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1450_fon+coord.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1450+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1450_fon+coord.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1450+coord.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1450_fon.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1450.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-1450_fon.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_1450.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-256_fon+coord.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_256+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-256_fon+coord.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_256+coord.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-256_fon.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_256.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-256_fon.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_256.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-512_fon+coord.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_512+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-512_fon+coord.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_512+coord.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-512_fon.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_512.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-512_fon.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_512.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-64_fon+coord.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_64+coord.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-64_fon+coord.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_64+coord.agg
diff --git a/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-64_fon.agg b/v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_64.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/2012-06-12_j13_s09-64_fon.agg
rename to v1.3.1/fonera_2.0/s09_j13_fon_2012-06-12/s09_j13_fon_2012-06-12_64.agg
diff --git a/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-10_fon.agg b/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_10.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-10_fon.agg
rename to v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_10.agg
diff --git a/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-15_fon.agg b/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_15.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-15_fon.agg
rename to v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_15.agg
diff --git a/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-20_fon.agg b/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_20.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-20_fon.agg
rename to v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_20.agg
diff --git a/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-25_fon.agg b/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_25.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-25_fon.agg
rename to v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_25.agg
diff --git a/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-5_fon.agg b/v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_5.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/2012-06-15_j15_s10-5_fon.agg
rename to v1.3.1/fonera_2.0/s10_j15_fon_2012-06-15/s10_j15_fon_2012-06-15_5.agg
diff --git a/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-100_fon.agg b/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_100.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-100_fon.agg
rename to v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_100.agg
diff --git a/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-1000_fon.agg b/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_1000.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-1000_fon.agg
rename to v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_1000.agg
diff --git a/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-250_fon.agg b/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_250.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-250_fon.agg
rename to v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_250.agg
diff --git a/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-500_fon.agg b/v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_500.agg
similarity index 100%
rename from v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/2012-06-15_j16_s11-500_fon.agg
rename to v1.3.1/fonera_2.0/s11_j16_fon_2012-06-15/s11_j16_fon_2012-06-15_500.agg