diff --git a/datas/water_aug-cc-pVDZ_CC3.json b/data/water_aug-cc-pVDZ_CC3.json
similarity index 100%
rename from datas/water_aug-cc-pVDZ_CC3.json
rename to data/water_aug-cc-pVDZ_CC3.json
diff --git a/datas/water_aug-cc-pVDZ_CC3.toto b/data/water_aug-cc-pVDZ_CC3.toto
similarity index 100%
rename from datas/water_aug-cc-pVDZ_CC3.toto
rename to data/water_aug-cc-pVDZ_CC3.toto
diff --git a/index.html b/index.html
index 512acfc0..34f40b87 100644
--- a/index.html
+++ b/index.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <script src="scripts/getdoiurl.js" type="text/javascript"></script>
+  <head>
+    <script src="scripts/data.js" type="text/javascript"></script>
     <script>
-    function update_file() {
-      inp=document.getElementById('filename_inp');
-      doilink=document.getElementById('doilink');
-      doilink.setAttribute('href',getdoiurlfromfile(inp.value+'.json'));
-      filelink=document.getElementById('filelink');
-      filelink.setAttribute('href','datas/'+inp.value+'.json');
-    }    
+      function update_file(filename) {
+        lnk_doi=document.getElementById('lnk_doi');
+        file=filename+'.json'
+        data=getDataFromFile(file)
+        lnk_doi.setAttribute('href',getDoiUrl(data));
+        lnk_file=document.getElementById('lnk_file');
+        lnk_file.setAttribute('href',getFullDataPath(file));
+      }    
     </script>
     <script>
-    window.onload=function() {
-      var inp = document.getElementById("filename_inp");
-      inp.addEventListener("keydown", function (e) {
-      if (e.keyCode === 13) {  //checks whether the pressed key is "Enter"
-        update_file(inp.value);
+      window.onload=function() {
+        var inp = document.getElementById("inp_filename");
+        inp.addEventListener("keydown", function (e) {
+          if (e.keyCode === 13) {  //checks whether the pressed key is "Enter"
+            update_file(inp.value);
+          }
+        }
+        );
       }
-  }
-  );
-    }
     </script>
-</head>
-<body>
-  <label>Write a data file name without extension
-  <input type="text" id='filename_inp'></input>
-  </label>
-  <a target="_blank" id='doilink'>Go to paper</a>
-  <a target="_blank" id='filelink'>Go to file</a>
-</body>
+  </head>
+  <body>
+    <label>Write a data file name without extension<br/>
+      <input type="text" id='inp_filename'></input>
+    </label><br/>
+    <a target="_blank" id='lnk_doi'>Go to paper</a>
+    <a target="_blank" id='lnk_file'>Go to file</a>
+  </body>
 </html>
\ No newline at end of file
diff --git a/scripts/data.js b/scripts/data.js
new file mode 100644
index 00000000..4da18a84
--- /dev/null
+++ b/scripts/data.js
@@ -0,0 +1,18 @@
+function getDataFromFile(file) {
+  var result = null;
+  var xmlhttp = new XMLHttpRequest();
+  xmlhttp
+  xmlhttp.open("GET",getFullDataPath(file), false);
+  xmlhttp.send();
+  if (xmlhttp.status==200) {
+    text = xmlhttp.responseText;
+  }
+  return JSON.parse(text);
+}
+
+function getDoiUrl(data) {
+  return 'https://doi.org/'+data.doi
+}
+function getFullDataPath(path) {
+  return 'data/'+path
+}
diff --git a/scripts/getdoiurl.js b/scripts/getdoiurl.js
deleted file mode 100644
index cf885afa..00000000
--- a/scripts/getdoiurl.js
+++ /dev/null
@@ -1,17 +0,0 @@
-function getjsonfromfile(path) {
-  var result = null;
-  var xmlhttp = new XMLHttpRequest();
-  xmlhttp
-  xmlhttp.open("GET", path, false);
-  xmlhttp.send();
-  if (xmlhttp.status==200) {
-    text = xmlhttp.responseText;
-  }
-  return JSON.parse(text);
-}
-function getdoiurl(datas) {
-  return 'https://doi.org/'+datas.doi
-}
-function getdoiurlfromfile(file) {
-  return getdoiurl(getjsonfromfile('datas/'+file))
-}
\ No newline at end of file
