diff --git a/baseline/all-in-one.py b/baseline/all-in-one.py
deleted file mode 100644
index ac1a050c8a16dbbd757ddea158908c5d3d90e0e8..0000000000000000000000000000000000000000
--- a/baseline/all-in-one.py
+++ /dev/null
@@ -1,9 +0,0 @@
-results = open('all-in-one.tsv', 'w')
-with open('results.txt', 'r') as f:
-    results.write('subTopicID\tresultID\n')
-    lines = f.readlines()
-    for line in lines[1:]:
-        result_id = line.split()[0]
-        results.write(result_id.split('.')[0]+'.1\t'+result_id+'\n')
-        
-    
diff --git a/baseline/singletons.py b/baseline/singletons.py
deleted file mode 100644
index b793ed91b82d79c997c41996a45db6c6cfdcae2e..0000000000000000000000000000000000000000
--- a/baseline/singletons.py
+++ /dev/null
@@ -1,9 +0,0 @@
-results = open('singletons.tsv', 'w')
-with open('results.txt', 'r') as f:
-    results.write('subTopicID\tresultID\n')
-    lines = f.readlines()
-    for line in lines[1:]:
-        result_id = line.split()[0]
-        results.write(result_id+'\t'+result_id+'\n')
-        
-    
diff --git a/src/all-in-one.py b/src/all-in-one.py
new file mode 100644
index 0000000000000000000000000000000000000000..42b91ea85ac99c18777c413009b5b797eb74c959
--- /dev/null
+++ b/src/all-in-one.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import config
+import time
+import sys
+
+time_int = int(time.strftime("%Y%m%d%H%M%S")[2:])
+final_path = 'final/{}.absinth'.format(hex(time_int)[2:])
+results = open(final_path, 'w')
+
+if '-t' in sys.argv:
+    data_path = config.test
+else:
+    data_path = config.dataset
+
+with open(data_path+'results.txt', 'r') as f:
+    
+    results.write('subTopicID\tresultID\n')
+    lines = f.readlines()
+    
+    for line in lines[1:]:
+        
+        result_id = line.split()[0]
+        results.write(result_id.split('.')[0]+'.1\t'+result_id+'\n')
+        
+results.close()
diff --git a/src/singletons.py b/src/singletons.py
new file mode 100644
index 0000000000000000000000000000000000000000..6709b2c2a57932ace42c716b8bedf41ec31ef753
--- /dev/null
+++ b/src/singletons.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import config
+import time
+import sys
+
+time_int = int(time.strftime("%Y%m%d%H%M%S")[2:])
+final_path = 'final/{}.absinth'.format(hex(time_int)[2:])
+results = open(final_path, 'w')
+
+if '-t' in sys.argv:
+    data_path = config.test
+else:
+    data_path = config.dataset
+
+with open(data_path+'results.txt', 'r') as f:
+    
+    results.write('subTopicID\tresultID\n')
+    lines = f.readlines()
+    
+    for line in lines[1:]:
+        
+        result_id = line.split()[0]
+        results.write(result_id+'\t'+result_id+'\n')
+        
+results.close()