diff --git a/mrv-20170721-01-child-default.cfg b/mrv-20170721-01-child-default.cfg
index 80cd176806..b0309605eb 100644
--- a/mrv-20170721-01-child-default.cfg
+++ b/mrv-20170721-01-child-default.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/child",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/child",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-child-front.cfg b/mrv-20170721-01-child-front.cfg
index 68640c81ca..a1072318e3 100644
--- a/mrv-20170721-01-child-front.cfg
+++ b/mrv-20170721-01-child-front.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/child-front",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/child-front",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-child-reduced.cfg b/mrv-20170721-01-child-reduced.cfg
index dd7c893bb4..eea68cbcb5 100644
--- a/mrv-20170721-01-child-reduced.cfg
+++ b/mrv-20170721-01-child-reduced.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/child-reduced",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/child-reduced",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-leaf-default.cfg b/mrv-20170721-01-leaf-default.cfg
index 67094cd1f3..7b5043b37a 100644
--- a/mrv-20170721-01-leaf-default.cfg
+++ b/mrv-20170721-01-leaf-default.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/leaf",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/leaf",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-leaf-front.cfg b/mrv-20170721-01-leaf-front.cfg
index b7eb0bfdbd..c8f47b4ad6 100644
--- a/mrv-20170721-01-leaf-front.cfg
+++ b/mrv-20170721-01-leaf-front.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/leaf-front",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/leaf-front",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-leaf-reduced.cfg b/mrv-20170721-01-leaf-reduced.cfg
index 811873b2a4..28cf81a569 100644
--- a/mrv-20170721-01-leaf-reduced.cfg
+++ b/mrv-20170721-01-leaf-reduced.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/leaf-reduced",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/leaf-reduced",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-opacity-default.cfg b/mrv-20170721-01-opacity-default.cfg
index a2358ec7d4..a6b0c39a8f 100644
--- a/mrv-20170721-01-opacity-default.cfg
+++ b/mrv-20170721-01-opacity-default.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/opacity",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/opacity",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-opacity-front.cfg b/mrv-20170721-01-opacity-front.cfg
index bd3549c74c..39dc1b7bdf 100644
--- a/mrv-20170721-01-opacity-front.cfg
+++ b/mrv-20170721-01-opacity-front.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/opacity-front",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/opacity-front",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-opacity-reduced.cfg b/mrv-20170721-01-opacity-reduced.cfg
index 002f978ee6..4dab9f8a2f 100644
--- a/mrv-20170721-01-opacity-reduced.cfg
+++ b/mrv-20170721-01-opacity-reduced.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/opacity-reduced",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/opacity-reduced",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-sand-default.cfg b/mrv-20170721-01-sand-default.cfg
index dd3c8639b8..2ff77254b0 100644
--- a/mrv-20170721-01-sand-default.cfg
+++ b/mrv-20170721-01-sand-default.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/sand",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/sand",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-sand-front.cfg b/mrv-20170721-01-sand-front.cfg
index 4a56cb492b..a3e27b1af9 100644
--- a/mrv-20170721-01-sand-front.cfg
+++ b/mrv-20170721-01-sand-front.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/sand-front",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/sand-front",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-sand-reduced.cfg b/mrv-20170721-01-sand-reduced.cfg
index 6e7b094807..e8ed1e524e 100644
--- a/mrv-20170721-01-sand-reduced.cfg
+++ b/mrv-20170721-01-sand-reduced.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/sand-reduced",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/sand-reduced",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-shen-default.cfg b/mrv-20170721-01-shen-default.cfg
index 3b104fba4a..6da386bc0a 100644
--- a/mrv-20170721-01-shen-default.cfg
+++ b/mrv-20170721-01-shen-default.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/shen",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/shen",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-shen-front.cfg b/mrv-20170721-01-shen-front.cfg
index d470283041..b10e9452b3 100644
--- a/mrv-20170721-01-shen-front.cfg
+++ b/mrv-20170721-01-shen-front.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/shen-front",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/shen-front",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-20170721-01-shen-reduced.cfg b/mrv-20170721-01-shen-reduced.cfg
index 74971176e8..2d0f378e3c 100644
--- a/mrv-20170721-01-shen-reduced.cfg
+++ b/mrv-20170721-01-shen-reduced.cfg
@@ -24,7 +24,7 @@ return {
     Task = "${TASKS}/default.task",
 
     Paths = {
-        SCRIPTS = "${BASE_PATH}/scripts/mrv/20170721-01-20170721-01/shen-reduced",
+        SCRIPTS = "${BASE_PATH}/scripts/mrv-20170721-01/shen-reduced",
         SHADERS = "${BASE_PATH}/shaders",
         OPENSPACE_DATA = "${BASE_PATH}/data",
         SCENE = "${OPENSPACE_DATA}/scene",
diff --git a/mrv-child-default.cfg b/mrv-child-default.cfg
index 4c348a56a5..525a23f466 100644
--- a/mrv-child-default.cfg
+++ b/mrv-child-default.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/child.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "child-default-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-child-front.cfg b/mrv-child-front.cfg
index dc323b9207..47e4ef0e14 100644
--- a/mrv-child-front.cfg
+++ b/mrv-child-front.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/child.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "child-front-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-child-reduced.cfg b/mrv-child-reduced.cfg
index b758454a2d..75afab7448 100644
--- a/mrv-child-reduced.cfg
+++ b/mrv-child-reduced.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/child.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "child-reduced-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-leaf-default.cfg b/mrv-leaf-default.cfg
index a241714436..54ad8d46f3 100644
--- a/mrv-leaf-default.cfg
+++ b/mrv-leaf-default.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/leaf.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "leaf-default-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-leaf-front.cfg b/mrv-leaf-front.cfg
index e939713fe7..e7555b7821 100644
--- a/mrv-leaf-front.cfg
+++ b/mrv-leaf-front.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/leaf.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "leaf-front-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-leaf-reduced.cfg b/mrv-leaf-reduced.cfg
index b710c6b0d2..be5f9ec8d3 100644
--- a/mrv-leaf-reduced.cfg
+++ b/mrv-leaf-reduced.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/leaf.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "leaf-reduced-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-opacity-default.cfg b/mrv-opacity-default.cfg
index cbc6b67556..8aa99a65db 100644
--- a/mrv-opacity-default.cfg
+++ b/mrv-opacity-default.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/opacity.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "opacity-default-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-opacity-front.cfg b/mrv-opacity-front.cfg
index d110ba9bb4..c374c070ea 100644
--- a/mrv-opacity-front.cfg
+++ b/mrv-opacity-front.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/opacity.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "opacity-front-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-opacity-reduced.cfg b/mrv-opacity-reduced.cfg
index 1d2575f8ff..f2b3668cbf 100644
--- a/mrv-opacity-reduced.cfg
+++ b/mrv-opacity-reduced.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/opacity.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "opacity-reduced-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-sand-default.cfg b/mrv-sand-default.cfg
index cbd9d11210..28d10b33e9 100644
--- a/mrv-sand-default.cfg
+++ b/mrv-sand-default.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/sand.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "sand-default-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-sand-front.cfg b/mrv-sand-front.cfg
index d90d45c290..0cc535c4c1 100644
--- a/mrv-sand-front.cfg
+++ b/mrv-sand-front.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/sand.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "sand-front-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-sand-reduced.cfg b/mrv-sand-reduced.cfg
index 2e5d3c480f..1fa9bb441b 100644
--- a/mrv-sand-reduced.cfg
+++ b/mrv-sand-reduced.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/sand.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "sand-reduced-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-shen-default.cfg b/mrv-shen-default.cfg
index dcf1ab339a..8015bf6a7a 100644
--- a/mrv-shen-default.cfg
+++ b/mrv-shen-default.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/shen.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "shen-default-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-shen-front.cfg b/mrv-shen-front.cfg
index 8b40543760..eff19007a9 100644
--- a/mrv-shen-front.cfg
+++ b/mrv-shen-front.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/shen.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "shen-front-",
         LogLevel = "Error",
         ImmediateFlush = true,
diff --git a/mrv-shen-reduced.cfg b/mrv-shen-reduced.cfg
index 6dabef3bd4..c347e2629f 100644
--- a/mrv-shen-reduced.cfg
+++ b/mrv-shen-reduced.cfg
@@ -8,7 +8,7 @@ return {
     Scene = "${SCENE}/multires/shen.scene",
 
     Logging = {
-        LogDir = "${LOGS}/mrv",
+        LogDir = "${LOGS}/mrv/20170721-00",
         PerformancePrefix = "shen-reduced-",
         LogLevel = "Error",
         ImmediateFlush = true,