diff --git a/MBB.py b/MBB.py
index f60ba9342ffa9d8a630f4c54b38c1d04bdf429f5..3aba487cce994af7ffccc36d93d0132b4ad8f41e 100755
--- a/MBB.py
+++ b/MBB.py
@@ -145,9 +145,7 @@ def cmd_gencodes(level):
         #level = 2 
         print(f"Generate level {level}")
         subprocess.run(f'tar -xf real_world_data.csv.tar.gz', shell=True, check=True)
-        dir = "scripts/"
-        os.chdir(dir)
-        subprocess.run(f'PYTHONPATH=../ python3 main.py --generator_dir errors --level {level} --real_world_data ../output.csv --remove_previous_generation_results', shell=True, check=True)
+        subprocess.run(f'python3 scripts/main.py --generator_dir errors --level {level} --real_world_data output.csv --remove_previous_generation_results', shell=True, check=True)
     else:
         raise Exception("Cannot find the generators. Please report that bug.")
     os.chdir(here)
diff --git a/README.md b/README.md
index 8ca4e96c4b4af220fb59d77e046dd7cbe7341916..be8ad5dc635338b6998e4a2a73ba8e8155aa333d 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ or
 cd /MBB
 tar -xf real_world_data.csv.tar.gz
 cd /MBB/scripts
-PYTHONPATH=../ python3 main.py --generator_dir errors --level 2 --real_world_data ../output.csv
+python3 main.py --generator_dir errors --level 2 --real_world_data ../output.csv
 ```
 
 ## Run a tool on the codes
diff --git a/scripts/ExampleUsage.py b/scripts/ExampleUsage.py
index 12c0122f1a8a396402442f3ed6eec6615738f5e5..422ba3ec0a3da936a73f86576d777a5a31bd4564 100644
--- a/scripts/ExampleUsage.py
+++ b/scripts/ExampleUsage.py
@@ -1,6 +1,6 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.MPICallFactroy import Correct_Parameter, MPI_Call_Factory, get_matching_recv
-from scripts.Infrastructure.Template import TemplateManager, InstructionBlock
+from Infrastructure.MPICallFactroy import Correct_Parameter, MPI_Call_Factory, get_matching_recv
+from Infrastructure.Template import TemplateManager, InstructionBlock
 
 
 class Invalid_negative_rank_error:
diff --git a/scripts/Infrastructure/AllocCall.py b/scripts/Infrastructure/AllocCall.py
index 7128beb66435f07795225859d8d3be867894bd0b..af095836b00d79c3b0fa0f2f8bdfd0b64592fdc3 100644
--- a/scripts/Infrastructure/AllocCall.py
+++ b/scripts/Infrastructure/AllocCall.py
@@ -3,8 +3,8 @@ from __future__ import annotations
 
 from typing_extensions import override
 
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.Variables import ERROR_MARKER_COMMENT_BEGIN, ERROR_MARKER_COMMENT_END
+from Infrastructure.Instruction import Instruction
+from Infrastructure.Variables import ERROR_MARKER_COMMENT_BEGIN, ERROR_MARKER_COMMENT_END
 
 alloc_template = """
 @{TYPE}@* @{NAME}@ = (@{TYPE}@*) @{FUNCTION}@(@{NUM}@ @{SEP}@ sizeof(@{TYPE}@)); 
diff --git a/scripts/Infrastructure/CorrectParameter.py b/scripts/Infrastructure/CorrectParameter.py
index 033cb735a66a5d8807007f94c93f252248c569d1..1e8dda1dcf5f0ada903e31956389a87d5135f3ae 100644
--- a/scripts/Infrastructure/CorrectParameter.py
+++ b/scripts/Infrastructure/CorrectParameter.py
@@ -1,8 +1,8 @@
 #! /usr/bin/python3
-from scripts.Infrastructure import MPICall
-from scripts.Infrastructure.Instruction import Instruction
-# from scripts.Infrastructure.MPICallFactory import MPICallFactory
-from scripts.Infrastructure.AllocCall import AllocCall, get_free
+from Infrastructure import MPICall
+from Infrastructure.Instruction import Instruction
+# from Infrastructure.MPICallFactory import MPICallFactory
+from Infrastructure.AllocCall import AllocCall, get_free
 
 
 class CorrectParameterFactory:
diff --git a/scripts/Infrastructure/GeneratorManager.py b/scripts/Infrastructure/GeneratorManager.py
index ba8be5e341b9aa1de786773dacb250c7995e17c7..abaca4408f37407fde8a4bde8bfa51505c51a69b 100644
--- a/scripts/Infrastructure/GeneratorManager.py
+++ b/scripts/Infrastructure/GeneratorManager.py
@@ -12,9 +12,9 @@ from pathlib import Path
 # for printing a nice progress bar
 import tqdm
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.Variables import *
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Template import TemplateManager
+from Infrastructure.Variables import *
 
 # number of digits to use numbering filenames
 digits_to_use = 3
diff --git a/scripts/Infrastructure/Instruction.py b/scripts/Infrastructure/Instruction.py
index 866627f301c42ce3a9ce0f5d3b6ffee8f4b88113..7d585f5e19ce57745057ec8d7a860c26a2e6c82b 100644
--- a/scripts/Infrastructure/Instruction.py
+++ b/scripts/Infrastructure/Instruction.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 from __future__ import annotations
 
-from scripts.Infrastructure.Variables import ERROR_MARKER_COMMENT_BEGIN, ERROR_MARKER_COMMENT_END
+from Infrastructure.Variables import ERROR_MARKER_COMMENT_BEGIN, ERROR_MARKER_COMMENT_END
 
 
 class Instruction(object):
diff --git a/scripts/Infrastructure/MPIAPIInfo/GenerateCallFactory.py b/scripts/Infrastructure/MPIAPIInfo/GenerateCallFactory.py
index 9e8f052dfcb0ac5c836d97fb57441baf4ea8d3de..502e125cf34662394ae77009432148c7fb8459a8 100644
--- a/scripts/Infrastructure/MPIAPIInfo/GenerateCallFactory.py
+++ b/scripts/Infrastructure/MPIAPIInfo/GenerateCallFactory.py
@@ -4,7 +4,7 @@
 import json
 
 
-from scripts.Infrastructure.MPIAPIInfo.MPIAPIParameters import get_mpi_version_dict
+from Infrastructure.MPIAPIInfo.MPIAPIParameters import get_mpi_version_dict
 
 template = """
     @staticmethod
@@ -15,7 +15,7 @@ template = """
 file_header="""#! /usr/bin/python3
 from collections import OrderedDict
 
-from scripts.Infrastructure.MPICall import MPICall
+from Infrastructure.MPICall import MPICall
 
 class MPICallFactory:
 
@@ -28,7 +28,7 @@ class MPICallFactory:
 
 correct_call_factory_header="""
 
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
 
 class CorrectMPICallFactory:
 
diff --git a/scripts/Infrastructure/MPICall.py b/scripts/Infrastructure/MPICall.py
index 30c8c9e8ad01e696ee0ec847923b43f43083cb94..1ddc2001ce7f26f4bfb18dea87975a39bf5f6f51 100644
--- a/scripts/Infrastructure/MPICall.py
+++ b/scripts/Infrastructure/MPICall.py
@@ -4,8 +4,8 @@ from __future__ import annotations
 import typing
 from typing_extensions import override
 
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.Variables import ERROR_MARKER_COMMENT_BEGIN, ERROR_MARKER_COMMENT_END
+from Infrastructure.Instruction import Instruction
+from Infrastructure.Variables import ERROR_MARKER_COMMENT_BEGIN, ERROR_MARKER_COMMENT_END
 
 
 class MPICall(Instruction):
diff --git a/scripts/Infrastructure/MPICallFactory.py b/scripts/Infrastructure/MPICallFactory.py
index b89d4ec7edd0e24fde44acd8bc885fff3905575d..4c1e9b9d64c6a01f3808d78a7b1ae8ae845d831f 100644
--- a/scripts/Infrastructure/MPICallFactory.py
+++ b/scripts/Infrastructure/MPICallFactory.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 from collections import OrderedDict
 
-from scripts.Infrastructure.MPICall import MPICall
+from Infrastructure.MPICall import MPICall
 
 class MPICallFactory:
 
@@ -2072,7 +2072,7 @@ class MPICallFactory:
         return MPICall("MPI_Wtime", OrderedDict([]), "1.0")
 
 
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
 
 class CorrectMPICallFactory:
 
diff --git a/scripts/Infrastructure/ScoingModule/ScoringTable.py b/scripts/Infrastructure/ScoingModule/ScoringTable.py
index d6eb3ec3f2aab1f1fe3f0f58da5eaf0e8c550ae0..fa5c1e04b64dd25014ac6bd4d22c5ef76e8dffec 100644
--- a/scripts/Infrastructure/ScoingModule/ScoringTable.py
+++ b/scripts/Infrastructure/ScoingModule/ScoringTable.py
@@ -5,7 +5,7 @@ from tqdm.auto import tqdm
 
 tqdm.pandas()
 
-from scripts.Infrastructure.MPIAPIInfo.MPIAPICategories import mpi_all_mpi
+from Infrastructure.MPIAPIInfo.MPIAPICategories import mpi_all_mpi
 
 # Settings
 categories_to_score = ["RANK", "TAG", "POLYXFER_NUM_ELEM_NNI", "DATATYPE", "COMMUNICATOR", "OPERATION"]
diff --git a/scripts/Infrastructure/Template.py b/scripts/Infrastructure/Template.py
index 4d9e8b309909552c8690dafa7278c8656f81eb84..5b419102228b0f65794d89026adf89cac0b0f2da 100644
--- a/scripts/Infrastructure/Template.py
+++ b/scripts/Infrastructure/Template.py
@@ -3,10 +3,10 @@ from __future__ import annotations
 
 import typing
 
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICall import MPICall
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Variables import ERROR_CLASSES
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICall import MPICall
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Variables import ERROR_CLASSES
 
 deadlock_marker = "\n\n This testcase can result in a Deadlock\n"
 
diff --git a/scripts/Infrastructure/TemplateFactory.py b/scripts/Infrastructure/TemplateFactory.py
index 1458a02fce377f70683a978c686dfe122a349b83..32f4e29427ae94447bd2a4a782f8e75c2a2d38e6 100644
--- a/scripts/Infrastructure/TemplateFactory.py
+++ b/scripts/Infrastructure/TemplateFactory.py
@@ -4,13 +4,13 @@ from __future__ import annotations
 import typing
 from typing import List, Tuple
 
-from scripts.Infrastructure.AllocCall import AllocCall
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPIAPIInfo.MPIAPICategories import mpi_scatter_collective_funcs
-from scripts.Infrastructure.MPICall import MPICall
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory, MPICallFactory
-from scripts.Infrastructure.Template import TemplateManager
+from Infrastructure.AllocCall import AllocCall
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPIAPIInfo.MPIAPICategories import mpi_scatter_collective_funcs
+from Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import CorrectMPICallFactory, MPICallFactory
+from Infrastructure.Template import TemplateManager
 
 list_of_not_implemented_types = [
     # TODO add wrong usage of
diff --git a/scripts/README.md b/scripts/README.md
index a75a4889d78e17455aa8f2b24aa8c865997e654d..b13b8150b84f864f4b84357cfd830e118d608c9b 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -1,2 +1,2 @@
 Command to run the script:
-PYTHONPATH=../ python main.py
+python main.py
diff --git a/scripts/errors/coll/CallOrdering.py b/scripts/errors/coll/CallOrdering.py
index 2bcc1687f5bc320483140d8d5dee2aaccec51d4e..7962f93c8ec5d7456d98daed193176aed5c6728f 100644
--- a/scripts/errors/coll/CallOrdering.py
+++ b/scripts/errors/coll/CallOrdering.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
-
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_collective_template, \
+from Infrastructure.Variables import *
+
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_send_recv_template, get_collective_template, \
     get_two_collective_template
 
 
diff --git a/scripts/errors/coll/Correct.py b/scripts/errors/coll/Correct.py
index d9103d129ccc3ef59772a084ceacc50622d12bba..b0704302deef243388c9cbec42e2bda6020397df 100644
--- a/scripts/errors/coll/Correct.py
+++ b/scripts/errors/coll/Correct.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_collective_template, get_two_collective_template
-from scripts.Infrastructure.Variables import *
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_collective_template, get_two_collective_template
+from Infrastructure.Variables import *
 
 
 class CorrectColl(ErrorGenerator):
diff --git a/scripts/errors/coll/InvalidComm.py b/scripts/errors/coll/InvalidComm.py
index 6710b7eea7637f9c76571bc401fbe1c320c6ae9e..0a291a212abb3e83b51c94d5118a7882c6a364a4 100644
--- a/scripts/errors/coll/InvalidComm.py
+++ b/scripts/errors/coll/InvalidComm.py
@@ -1,9 +1,9 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.Variables import *
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.TemplateFactory import get_collective_template
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.TemplateFactory import get_collective_template
 
 
 class InvalidComErrorColl(ErrorGenerator):
diff --git a/scripts/errors/coll/InvalidOp.py b/scripts/errors/coll/InvalidOp.py
index d39708985e0491b9ecd09ac827977cbe11aefa4a..6c1f8ed6b1a29edb61a6f76d0f85068c5cefc6eb 100644
--- a/scripts/errors/coll/InvalidOp.py
+++ b/scripts/errors/coll/InvalidOp.py
@@ -1,8 +1,8 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.TemplateFactory import get_collective_template
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.TemplateFactory import get_collective_template
 
 
 class InvalidComErrorColl(ErrorGenerator):
diff --git a/scripts/errors/coll/InvalidRank.py b/scripts/errors/coll/InvalidRank.py
index 720b5c783d40ee360e0641c3abc241a9a9ee520b..fc81a66b6d3ace6f75bfd8795d9c56d36beeb2d2 100644
--- a/scripts/errors/coll/InvalidRank.py
+++ b/scripts/errors/coll/InvalidRank.py
@@ -1,8 +1,8 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.TemplateFactory import get_collective_template
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.TemplateFactory import get_collective_template
 
 
 class InvalidRankErrorColl(ErrorGenerator):
diff --git a/scripts/errors/coll/InvalidType.py b/scripts/errors/coll/InvalidType.py
index a79d5f276280c2f9b84d0396ce3fcd41e705d49c..be9bbe2e9e5e48f7c84ecd3bcb704d9ca72642e6 100644
--- a/scripts/errors/coll/InvalidType.py
+++ b/scripts/errors/coll/InvalidType.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
-
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_collective_template
+from Infrastructure.Variables import *
+
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_collective_template
 
 
 class InvalidComErrorColl(ErrorGenerator):
diff --git a/scripts/errors/coll/LocalConcurrency.py b/scripts/errors/coll/LocalConcurrency.py
index af576f06acb95055084577592503d6f6c396d8d2..ee9a9bd20343405da7b33293471293e7458cf456 100644
--- a/scripts/errors/coll/LocalConcurrency.py
+++ b/scripts/errors/coll/LocalConcurrency.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_collective_template
-from scripts.Infrastructure.Variables import *
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_collective_template
+from Infrastructure.Variables import *
 
 
 class InvalidRankErrorColl(ErrorGenerator):
diff --git a/scripts/errors/coll/ParamMatching.py b/scripts/errors/coll/ParamMatching.py
index 89c2d78b1c5f0330207bf42b229302d8a71a0cb4..69de9e1f017e400636189d5e165614d03055bc73 100644
--- a/scripts/errors/coll/ParamMatching.py
+++ b/scripts/errors/coll/ParamMatching.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_collective_template, get_two_collective_template
-from scripts.Infrastructure.Variables import BASIC_TEST_LEVEL
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_collective_template, get_two_collective_template
+from Infrastructure.Variables import BASIC_TEST_LEVEL
 
 
 class InvalidComErrorColl(ErrorGenerator):
diff --git a/scripts/errors/coll/ParamMatchingType.py b/scripts/errors/coll/ParamMatchingType.py
index 6d4126b6a03b7401dadaaf7735758af3ffa474c8..f1ad7333f0594d719b5337410520b2ef673e79a6 100644
--- a/scripts/errors/coll/ParamMatchingType.py
+++ b/scripts/errors/coll/ParamMatchingType.py
@@ -1,11 +1,11 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.MPIAPIInfo.MPIAPICategories import mpi_scatter_collective_funcs
-from scripts.Infrastructure.ScoingModule.ScoringTable import is_combination_important
-from scripts.Infrastructure.Variables import *
+from Infrastructure.MPIAPIInfo.MPIAPICategories import mpi_scatter_collective_funcs
+from Infrastructure.ScoingModule.ScoringTable import is_combination_important
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_collective_template, predefined_types, user_defined_types, \
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_collective_template, predefined_types, user_defined_types, \
     predefined_mpi_dtype_consants, get_type_buffers, get_bytes_size_for_type, get_communicator, get_intercomm, \
     get_buffer_for_type, get_buffer_for_usertype
 
diff --git a/scripts/errors/coll/RequestLifeCycle.py b/scripts/errors/coll/RequestLifeCycle.py
index 691e4c6410ac52e092ce4e2392fc428e634fa684..ef6a7cd71dea257d0b48d01c5b518ae069d186e5 100644
--- a/scripts/errors/coll/RequestLifeCycle.py
+++ b/scripts/errors/coll/RequestLifeCycle.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_collective_template
-from scripts.Infrastructure.Variables import *
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_send_recv_template, get_collective_template
+from Infrastructure.Variables import *
 
 
 class CorrectColl(ErrorGenerator):
diff --git a/scripts/errors/dtypes/DtypeMissmatch.py b/scripts/errors/dtypes/DtypeMissmatch.py
index 9a0a87b18dfd62d5e668fc2a1a51b5b6b5746328..76fc3971ce57a9c9ec8f1e629f5d003747e98be5 100644
--- a/scripts/errors/dtypes/DtypeMissmatch.py
+++ b/scripts/errors/dtypes/DtypeMissmatch.py
@@ -2,20 +2,20 @@
 from copy import copy
 from random import shuffle
 
-from scripts.Infrastructure.AllocCall import AllocCall
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.ScoingModule.ScoringTable import is_combination_important
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, get_communicator, \
+from Infrastructure.AllocCall import AllocCall
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.ScoingModule.ScoringTable import is_combination_important
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, get_communicator, \
     get_intercomm, predefined_types, user_defined_types, predefined_mpi_dtype_consants, get_type_buffers, \
     get_bytes_size_for_type, get_buffer_for_type, get_buffer_for_usertype
 
 from itertools import chain
 
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
 # TODO refactoring into different file
 # test if the tool chan deal with messages send over different communicators
diff --git a/scripts/errors/other/Initialized.py b/scripts/errors/other/Initialized.py
index 29bf83eb0d8855deca0f56728267ac1aaae39d3c..d2175b8606b54714173939ed6d48fa8799a56d32 100644
--- a/scripts/errors/other/Initialized.py
+++ b/scripts/errors/other/Initialized.py
@@ -1,10 +1,10 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.Variables import *
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_communicator, get_intercomm, \
+from Infrastructure.Template import TemplateManager
+from Infrastructure.Variables import *
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory
+from Infrastructure.TemplateFactory import get_communicator, get_intercomm, \
     get_invalid_param_p2p_case, get_send_recv_template
 
 sendrecv_funcs = ["mpi_sendrecv", "mpi_sendrecv_replace"]
diff --git a/scripts/errors/pt2pt/Correct.py b/scripts/errors/pt2pt/Correct.py
index 261fff864cab95c6d93b27b3bf065707660412f7..81fee373aab9afa93d9b8e3a6e8ecae60153a543 100644
--- a/scripts/errors/pt2pt/Correct.py
+++ b/scripts/errors/pt2pt/Correct.py
@@ -1,14 +1,14 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 from copy import copy
 
-from scripts.Infrastructure.AllocCall import AllocCall
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case
+from Infrastructure.AllocCall import AllocCall
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case
 
 from itertools import chain
 
diff --git a/scripts/errors/pt2pt/InvalidBuf.py b/scripts/errors/pt2pt/InvalidBuf.py
index 6cad1686e740e2113bf7ff4c35cbc7fdfc47e95e..8c6133191cf32a4fe2b1a3ea514065b2a705fa67 100644
--- a/scripts/errors/pt2pt/InvalidBuf.py
+++ b/scripts/errors/pt2pt/InvalidBuf.py
@@ -1,14 +1,14 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 from copy import copy
 
-from scripts.Infrastructure.AllocCall import AllocCall
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case
+from Infrastructure.AllocCall import AllocCall
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case
 
 from itertools import chain
 
diff --git a/scripts/errors/pt2pt/InvalidComm.py b/scripts/errors/pt2pt/InvalidComm.py
index ac8fda6739d9ea8b777f87de79b4e8dd02e7b4f5..ac2fb6d1954c0d4c3abd99eaf67ea53699dbea40 100644
--- a/scripts/errors/pt2pt/InvalidComm.py
+++ b/scripts/errors/pt2pt/InvalidComm.py
@@ -1,9 +1,9 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import MPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_communicator, get_intercomm, \
+from Infrastructure.Variables import *
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import MPICallFactory
+from Infrastructure.TemplateFactory import get_communicator, get_intercomm, \
     get_invalid_param_p2p_case
 
 sendrecv_funcs = ["mpi_sendrecv", "mpi_sendrecv_replace"]
diff --git a/scripts/errors/pt2pt/InvalidFlag.py b/scripts/errors/pt2pt/InvalidFlag.py
index 1499525bff7d879be95d4bcc64b8952fdb6f20e2..2145c7bebd64207b9ea81ac642406bdeb5c2a3d4 100644
--- a/scripts/errors/pt2pt/InvalidFlag.py
+++ b/scripts/errors/pt2pt/InvalidFlag.py
@@ -1,11 +1,11 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory, MPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, replace_wait
+from Infrastructure.MPICallFactory import CorrectMPICallFactory, MPICallFactory
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, replace_wait
 
 
 class InvalidFlagErrorP2P(ErrorGenerator):
diff --git a/scripts/errors/pt2pt/InvalidRank.py b/scripts/errors/pt2pt/InvalidRank.py
index addc7e6c907aa9def39fe3f6f78f1f0ff1526c6d..9d120ca1822ef8b315d7c00f670bf32f44a36b01 100644
--- a/scripts/errors/pt2pt/InvalidRank.py
+++ b/scripts/errors/pt2pt/InvalidRank.py
@@ -1,11 +1,11 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, insert_probe
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, insert_probe
 
 
 class InvalidRankErrorP2P(ErrorGenerator):
diff --git a/scripts/errors/pt2pt/InvalidRequest.py b/scripts/errors/pt2pt/InvalidRequest.py
index eac5360603e73d53259c9fe9050348f6d2153b11..576fd92eb6d6f7cd4237d94ec7fb325fd1643299 100644
--- a/scripts/errors/pt2pt/InvalidRequest.py
+++ b/scripts/errors/pt2pt/InvalidRequest.py
@@ -1,11 +1,11 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICall import MPICall
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, replace_wait
-from scripts.Infrastructure.MPICallFactory import MPICallFactory
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICall import MPICall
+from Infrastructure.TemplateFactory import get_send_recv_template, replace_wait
+from Infrastructure.MPICallFactory import MPICallFactory
 
 
 class InvalidRequestErrorP2P(ErrorGenerator):
diff --git a/scripts/errors/pt2pt/InvalidStatus.py b/scripts/errors/pt2pt/InvalidStatus.py
index 6587da60dfa276ecb0003d3690135d091d429040..c93666206a72de6e10bcbc605c07d4ab669f0dd1 100644
--- a/scripts/errors/pt2pt/InvalidStatus.py
+++ b/scripts/errors/pt2pt/InvalidStatus.py
@@ -1,11 +1,11 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory, MPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, replace_wait, \
+from Infrastructure.MPICallFactory import CorrectMPICallFactory, MPICallFactory
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, replace_wait, \
     insert_probe
 
 
diff --git a/scripts/errors/pt2pt/InvalidTag.py b/scripts/errors/pt2pt/InvalidTag.py
index a7d3592db0ae5a0e7dc66528d992d2339cf83c92..830df72d4e58face5c7004f9a97852ee917707ee 100644
--- a/scripts/errors/pt2pt/InvalidTag.py
+++ b/scripts/errors/pt2pt/InvalidTag.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
-
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICall import MPICall
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, insert_probe
+from Infrastructure.Variables import *
+
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_send_recv_template, get_invalid_param_p2p_case, insert_probe
 
 
 class InvalidTagErrorP2P(ErrorGenerator):
diff --git a/scripts/errors/pt2pt/LocalConcurrency.py b/scripts/errors/pt2pt/LocalConcurrency.py
index 635ba1767e5be29d1fa47b1918f4a864cca2e39e..996c07225a82264450e2c0054651c3766b2b911e 100644
--- a/scripts/errors/pt2pt/LocalConcurrency.py
+++ b/scripts/errors/pt2pt/LocalConcurrency.py
@@ -1,9 +1,9 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.TemplateFactory import get_send_recv_template
 
 sendrecv_funcs = ["mpi_sendrecv", "mpi_sendrecv_replace"]
 
diff --git a/scripts/errors/pt2pt/MessageRace.py b/scripts/errors/pt2pt/MessageRace.py
index 226bbd670699d1b6e237f1912b9fd2f854642046..df5302a7c2a53c5a4b5ec2a31be9b148ef86bca5 100644
--- a/scripts/errors/pt2pt/MessageRace.py
+++ b/scripts/errors/pt2pt/MessageRace.py
@@ -1,10 +1,10 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.Template import TemplateManager
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.Template import TemplateManager
 
 
 class MessageRaceErrorAnyTag(ErrorGenerator):
diff --git a/scripts/errors/pt2pt/RecvBeforeSend.py b/scripts/errors/pt2pt/RecvBeforeSend.py
index 2caae3e04fb9f217a31c0359154ac6d911cc5beb..7d31a0d3ef00a0a74548be3fc633fed83a28302a 100644
--- a/scripts/errors/pt2pt/RecvBeforeSend.py
+++ b/scripts/errors/pt2pt/RecvBeforeSend.py
@@ -1,11 +1,11 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 import itertools
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template, insert_probe
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_send_recv_template, insert_probe
 
 
 class RecvBeforeSend(ErrorGenerator):
diff --git a/scripts/errors/pt2pt/Unmatched.py b/scripts/errors/pt2pt/Unmatched.py
index a307cc198246368f91f17c0f2c854985fc15e26d..fc83a38395fcc2f1077ea23ea65cd0b0bfa8fce4 100644
--- a/scripts/errors/pt2pt/Unmatched.py
+++ b/scripts/errors/pt2pt/Unmatched.py
@@ -1,10 +1,10 @@
 #! /usr/bin/python3
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Instruction import Instruction
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_send_recv_template
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_send_recv_template
 
 
 class UnmatchedP2Pcall(ErrorGenerator):
diff --git a/scripts/errors/rma/EpochLifeCycle.py b/scripts/errors/rma/EpochLifeCycle.py
index b23da95ceec1bdb9394a71b64819c4cb69009e9d..393f047edb168dcaebccc06201fdef53558ebc2e 100644
--- a/scripts/errors/rma/EpochLifeCycle.py
+++ b/scripts/errors/rma/EpochLifeCycle.py
@@ -1,13 +1,13 @@
 #! /usr/bin/python3
 from __future__ import annotations
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_invalid_param_rma_case, get_rma_template
-from scripts.Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_invalid_param_rma_case, get_rma_template
+from Infrastructure.MPICall import MPICall
 
 import copy
 
diff --git a/scripts/errors/rma/GlobalConcurrency.py b/scripts/errors/rma/GlobalConcurrency.py
index 8358cd07b56ab9aeca942e6ebba9ad5ad9b197ce..f2296d3c8b65f7d60d4af695db23760da063c27b 100644
--- a/scripts/errors/rma/GlobalConcurrency.py
+++ b/scripts/errors/rma/GlobalConcurrency.py
@@ -1,16 +1,16 @@
 #! /usr/bin/python3
 from __future__ import annotations
 
-from scripts.Infrastructure.Variables import *
-
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICall import MPICall
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_allocated_window, get_rma_call
-from scripts.Infrastructure.AllocCall import AllocCall
+from Infrastructure.Variables import *
+
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_allocated_window, get_rma_call
+from Infrastructure.AllocCall import AllocCall
 
 import itertools
 
diff --git a/scripts/errors/rma/InvalidBuffer.py b/scripts/errors/rma/InvalidBuffer.py
index 18a6c927f1bd52def916c12f9e30e163e97e9d4d..f740031462eeb1d1ffa913751fcb0eca0ed823c2 100644
--- a/scripts/errors/rma/InvalidBuffer.py
+++ b/scripts/errors/rma/InvalidBuffer.py
@@ -1,13 +1,13 @@
 #! /usr/bin/python3
 from __future__ import annotations
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_invalid_param_rma_case, get_rma_template
-from scripts.Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_invalid_param_rma_case, get_rma_template
+from Infrastructure.MPICall import MPICall
 
 
 class InvalidBufferErrorRMA(ErrorGenerator):
diff --git a/scripts/errors/rma/InvalidDataType.py b/scripts/errors/rma/InvalidDataType.py
index a1daff8cf2e4376063c37103f840ced43b240b34..8b3cba524b6172621d4b221e4c2703a1c1367983 100644
--- a/scripts/errors/rma/InvalidDataType.py
+++ b/scripts/errors/rma/InvalidDataType.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
 from __future__ import annotations
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_invalid_param_rma_case
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_invalid_param_rma_case
 
 
 class InvalidDatatypeErrorRMA(ErrorGenerator):
diff --git a/scripts/errors/rma/InvalidRank.py b/scripts/errors/rma/InvalidRank.py
index 9b0cf6a11758866157b0c476c97f0ea3c0220f21..70433270ca29d7b1a26b4bf748d9f55671b73030 100644
--- a/scripts/errors/rma/InvalidRank.py
+++ b/scripts/errors/rma/InvalidRank.py
@@ -1,12 +1,12 @@
 #! /usr/bin/python3
 from __future__ import annotations
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.TemplateFactory import get_invalid_param_rma_case
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.TemplateFactory import get_invalid_param_rma_case
 
 
 class InvalidRankErrorRMA(ErrorGenerator):
diff --git a/scripts/errors/rma/InvalidWin.py b/scripts/errors/rma/InvalidWin.py
index ad8729ce9a680196cb55663130a6ed440a23ba98..67078762bc206daf194363498b041e8fab4e0c51 100644
--- a/scripts/errors/rma/InvalidWin.py
+++ b/scripts/errors/rma/InvalidWin.py
@@ -1,14 +1,14 @@
 #! /usr/bin/python3
 from __future__ import annotations
-from scripts.Infrastructure.Variables import *
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
 
-from scripts.Infrastructure.MPICallFactory import CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.TemplateFactory import get_invalid_param_rma_case, get_rma_template
-from scripts.Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.TemplateFactory import get_invalid_param_rma_case, get_rma_template
+from Infrastructure.MPICall import MPICall
 
 
 class InvalidWinErrorRMA(ErrorGenerator):
diff --git a/scripts/errors/rma/LocalConcurrency.py b/scripts/errors/rma/LocalConcurrency.py
index ae16e6e8c888821e1fc2b4097d5d169a66035d1c..9bc87c75f3f19de8a1e9ddb9c58c424d83c2a425 100644
--- a/scripts/errors/rma/LocalConcurrency.py
+++ b/scripts/errors/rma/LocalConcurrency.py
@@ -1,16 +1,16 @@
 #! /usr/bin/python3
 from __future__ import annotations
 
-from scripts.Infrastructure.Variables import *
-
-from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
-from scripts.Infrastructure.Instruction import Instruction
-from scripts.Infrastructure.MPICall import MPICall
-from scripts.Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
-from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory
-from scripts.Infrastructure.Template import TemplateManager
-from scripts.Infrastructure.TemplateFactory import get_allocated_window, get_rma_call
-from scripts.Infrastructure.AllocCall import AllocCall
+from Infrastructure.Variables import *
+
+from Infrastructure.ErrorGenerator import ErrorGenerator
+from Infrastructure.Instruction import Instruction
+from Infrastructure.MPICall import MPICall
+from Infrastructure.MPICallFactory import MPICallFactory, CorrectMPICallFactory
+from Infrastructure.CorrectParameter import CorrectParameterFactory
+from Infrastructure.Template import TemplateManager
+from Infrastructure.TemplateFactory import get_allocated_window, get_rma_call
+from Infrastructure.AllocCall import AllocCall
 
 import itertools
 
diff --git a/scripts/main.py b/scripts/main.py
index 1634009c0f5364f3438d821e70b1b843d88dd56d..a14b90079084b75844b78abd0cd2b819671732ce 100644
--- a/scripts/main.py
+++ b/scripts/main.py
@@ -3,10 +3,10 @@ import os
 
 import argparse
 
-from scripts.Infrastructure.GeneratorManager import GeneratorManager
-from scripts.Infrastructure.Variables import *
+from Infrastructure.GeneratorManager import GeneratorManager
+from Infrastructure.Variables import *
 
-from scripts.Infrastructure.ScoingModule.ScoringTable import get_scoring_table
+from Infrastructure.ScoingModule.ScoringTable import get_scoring_table
 import pandas as pd
 
 if __name__ == "__main__":