From 2e72bc44fac67ec5b23bee6d7b7c2bc4646c5277 Mon Sep 17 00:00:00 2001
From: Simon Schwitanski <schwitanski@itc.rwth-aachen.de>
Date: Tue, 6 Aug 2024 11:10:47 +0200
Subject: [PATCH] Get rid of PYTHONPATH=.. required in commands

---
 MBB.py                                        |  4 +---
 README.md                                     |  2 +-
 scripts/ExampleUsage.py                       |  4 ++--
 scripts/Infrastructure/AllocCall.py           |  4 ++--
 scripts/Infrastructure/CorrectParameter.py    |  8 ++++----
 scripts/Infrastructure/GeneratorManager.py    |  6 +++---
 scripts/Infrastructure/Instruction.py         |  2 +-
 .../MPIAPIInfo/GenerateCallFactory.py         |  6 +++---
 scripts/Infrastructure/MPICall.py             |  4 ++--
 scripts/Infrastructure/MPICallFactory.py      |  4 ++--
 .../ScoingModule/ScoringTable.py              |  2 +-
 scripts/Infrastructure/Template.py            |  8 ++++----
 scripts/Infrastructure/TemplateFactory.py     | 14 ++++++-------
 scripts/README.md                             |  2 +-
 scripts/errors/coll/CallOrdering.py           | 16 +++++++--------
 scripts/errors/coll/Correct.py                | 14 ++++++-------
 scripts/errors/coll/InvalidComm.py            |  8 ++++----
 scripts/errors/coll/InvalidOp.py              |  6 +++---
 scripts/errors/coll/InvalidRank.py            |  6 +++---
 scripts/errors/coll/InvalidType.py            | 16 +++++++--------
 scripts/errors/coll/LocalConcurrency.py       | 14 ++++++-------
 scripts/errors/coll/ParamMatching.py          | 14 ++++++-------
 scripts/errors/coll/ParamMatchingType.py      | 12 +++++------
 scripts/errors/coll/RequestLifeCycle.py       | 14 ++++++-------
 scripts/errors/dtypes/DtypeMissmatch.py       | 18 ++++++++---------
 scripts/errors/other/Initialized.py           | 12 +++++------
 scripts/errors/pt2pt/Correct.py               | 16 +++++++--------
 scripts/errors/pt2pt/InvalidBuf.py            | 16 +++++++--------
 scripts/errors/pt2pt/InvalidComm.py           | 10 +++++-----
 scripts/errors/pt2pt/InvalidFlag.py           | 10 +++++-----
 scripts/errors/pt2pt/InvalidRank.py           | 10 +++++-----
 scripts/errors/pt2pt/InvalidRequest.py        | 12 +++++------
 scripts/errors/pt2pt/InvalidStatus.py         | 10 +++++-----
 scripts/errors/pt2pt/InvalidTag.py            | 16 +++++++--------
 scripts/errors/pt2pt/LocalConcurrency.py      |  8 ++++----
 scripts/errors/pt2pt/MessageRace.py           | 10 +++++-----
 scripts/errors/pt2pt/RecvBeforeSend.py        | 10 +++++-----
 scripts/errors/pt2pt/Unmatched.py             | 10 +++++-----
 scripts/errors/rma/EpochLifeCycle.py          | 12 +++++------
 scripts/errors/rma/GlobalConcurrency.py       | 20 +++++++++----------
 scripts/errors/rma/InvalidBuffer.py           | 12 +++++------
 scripts/errors/rma/InvalidDataType.py         | 10 +++++-----
 scripts/errors/rma/InvalidRank.py             | 10 +++++-----
 scripts/errors/rma/InvalidWin.py              | 14 ++++++-------
 scripts/errors/rma/LocalConcurrency.py        | 20 +++++++++----------
 scripts/main.py                               |  6 +++---
 46 files changed, 230 insertions(+), 232 deletions(-)

diff --git a/MBB.py b/MBB.py
index f60ba9342..3aba487cc 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 8ca4e96c4..be8ad5dc6 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 12c0122f1..422ba3ec0 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 7128beb66..af095836b 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 033cb735a..1e8dda1dc 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 ba8be5e34..abaca4408 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 866627f30..7d585f5e1 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 9e8f052df..502e125cf 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 30c8c9e8a..1ddc2001c 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 b89d4ec7e..4c1e9b9d6 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 d6eb3ec3f..fa5c1e04b 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 4d9e8b309..5b4191022 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 1458a02fc..32f4e2942 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 a75a4889d..b13b8150b 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 2bcc1687f..7962f93c8 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 d9103d129..b0704302d 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 6710b7eea..0a291a212 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 d39708985..6c1f8ed6b 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 720b5c783..fc81a66b6 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 a79d5f276..be9bbe2e9 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 af576f06a..ee9a9bd20 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 89c2d78b1..69de9e1f0 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 6d4126b6a..f1ad7333f 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 691e4c641..ef6a7cd71 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 9a0a87b18..76fc3971c 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 29bf83eb0..d2175b860 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 261fff864..81fee373a 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 6cad1686e..8c6133191 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 ac8fda673..ac2fb6d19 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 1499525bf..2145c7beb 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 addc7e6c9..9d120ca18 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 eac536060..576fd92eb 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 6587da60d..c93666206 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 a7d3592db..830df72d4 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 635ba1767..996c07225 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 226bbd670..df5302a7c 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 2caae3e04..7d31a0d3e 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 a307cc198..fc83a3839 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 b23da95ce..393f047ed 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 8358cd07b..f2296d3c8 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 18a6c927f..f74003146 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 a1daff8cf..8b3cba524 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 9b0cf6a11..70433270c 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 ad8729ce9..67078762b 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 ae16e6e8c..9bc87c75f 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 1634009c0..a14b90079 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__":
-- 
GitLab