diff --git a/src/components/experiment-list/experiment-list-element.js b/src/components/experiment-list/experiment-list-element.js
index e72a04cd04f482eb8e8b17acc54dc1083e5bb45e..81c3b33ac41d7ecb1a00248b78f7a245af531bad 100644
--- a/src/components/experiment-list/experiment-list-element.js
+++ b/src/components/experiment-list/experiment-list-element.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import timeDDHHMMSS from '../../app/scripts/common/filters/time-filter.js';
+import timeDDHHMMSS from '../../utility/time-filter.js';
 import ExperimentsService from '../../services/proxy/experiments-service.js';
 
 import './experiment-list-element.css';
diff --git a/src/services/proxy/data/endpoints.json b/src/services/proxy/data/endpoints.json
index 3f97f00cfee0790de567a9643332b0860600ca4e..5a34e2df3e940210179b66e5f1d6f50245d29c15 100644
--- a/src/services/proxy/data/endpoints.json
+++ b/src/services/proxy/data/endpoints.json
@@ -1,8 +1,5 @@
 {
     "proxy": {
-        "experiments": {
-            "url": "/storage/experiments"
-        },
         "experimentImage": {
             "url": "/experimentImage"
         },
@@ -16,7 +13,10 @@
             }
         },
         "storage": {
-            "url": "/storage"
+            "url": "/storage",
+            "experiments": {
+                "url": "/storage/experiments"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/services/proxy/experiments-service.js b/src/services/proxy/experiments-service.js
index 865a8166eabb509260c07f555795b385c32a5ec4..caafa7ce929fc70bef5629cd386e4df5e0778b98 100644
--- a/src/services/proxy/experiments-service.js
+++ b/src/services/proxy/experiments-service.js
@@ -37,7 +37,7 @@ class ExperimentsService extends HttpService {
   async getExperiments() {
     if (!this.experiments) {
       const proxyEndpoint = endpoints.proxy;
-      const experimentsUrl = `${config.api.proxy.url}${proxyEndpoint.experiments.url}`;
+      const experimentsUrl = `${config.api.proxy.url}${proxyEndpoint.storage.experiments.url}`;
       let response = await this.httpRequestGET(experimentsUrl);
       this.experiments = response.json();
     }
diff --git a/src/app/scripts/common/filters/time-filter.js b/src/utility/time-filter.js
similarity index 100%
rename from src/app/scripts/common/filters/time-filter.js
rename to src/utility/time-filter.js