large scale refactoring of SNA

pm4py · Jan 18, 2019 · 32f589d · 32f589d
1 parent d9c0718
commit 32f589d
Show file tree

Hide file tree

Showing 94 changed files with 82 additions and 81 deletions.
diff --git a/example_simulation.py b/example_simulation.py
@@ -1,6 +1,6 @@
 import os
 
-from pm4py.algo.other.simple.model.tracelog import factory as simple_extraction_factory
+from pm4py.algo.simulation.simple.model.tracelog import factory as simple_extraction_factory
 from pm4py.objects.log.importer.xes import factory as xes_importer
 from pm4py.objects.stochastic_petri import map as stochastic_map
 from pm4py.objects.stochastic_petri.lp_perf_bounds import LpPerfBounds

diff --git a/examples/sna_example_df.py b/examples/sna_example_df.py
@@ -1,9 +1,9 @@
 import os
 
-from pm4py.algo.sna.metrics.handover import factory as handover_of_work
-from pm4py.algo.sna.metrics.real_handover import factory as real_handover_of_work
-from pm4py.algo.sna.metrics.similar_activities import factory as similar_activities
-from pm4py.algo.sna.transformer.pandas import factory as sna_transformer
+from pm4py.algo.enhancement.sna.metrics.handover import factory as handover_of_work
+from pm4py.algo.enhancement.sna.metrics.real_handover import factory as real_handover_of_work
+from pm4py.algo.enhancement.sna.metrics.similar_activities import factory as similar_activities
+from pm4py.algo.enhancement.sna.transformer.pandas import factory as sna_transformer
 from pm4py.objects.log.adapters.pandas import csv_import_adapter
 from pm4py.visualization.sna import factory as sna_vis_factory
 

diff --git a/examples/sna_example_log.py b/examples/sna_example_log.py
@@ -1,8 +1,8 @@
 import os
 
-from pm4py.algo.sna.metrics.handover import factory as handover_of_work
-from pm4py.algo.sna.metrics.similar_activities import factory as similar_activities
-from pm4py.algo.sna.transformer.tracelog import factory as sna_transformer
+from pm4py.algo.enhancement.sna.metrics.handover import factory as handover_of_work
+from pm4py.algo.enhancement.sna.metrics.similar_activities import factory as similar_activities
+from pm4py.algo.enhancement.sna.transformer.tracelog import factory as sna_transformer
 from pm4py.objects.log.importer.xes import factory as xes_importer
 from pm4py.visualization.sna import factory as sna_vis_factory
 

diff --git a/pm4py/algo/__init__.py b/pm4py/algo/__init__.py
@@ -1 +1 @@
-from pm4py.algo import sna, conformance, discovery, filtering
+from pm4py.algo import conformance, discovery, enhancement, filtering
diff --git a/pm4py/algo/enhancement/__init__.py b/pm4py/algo/enhancement/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement import sna
diff --git a/pm4py/algo/enhancement/sna/__init__.py b/pm4py/algo/enhancement/sna/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna import metrics, transformer
diff --git a/pm4py/algo/enhancement/sna/metrics/__init__.py b/pm4py/algo/enhancement/sna/metrics/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics import handover, real_handover, similar_activities
diff --git a/pm4py/algo/enhancement/sna/metrics/handover/__init__.py b/pm4py/algo/enhancement/sna/metrics/handover/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics.handover import versions, factory
diff --git a/pm4py/algo/sna/metrics/handover/factory.py → ...hancement/sna/metrics/handover/factory.py b/pm4py/algo/sna/metrics/handover/factory.py → ...hancement/sna/metrics/handover/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.metrics.handover.versions import classic
+from pm4py.algo.enhancement.sna.metrics.handover.versions import classic
 
 CLASSIC = "classic"
 

diff --git a/pm4py/algo/enhancement/sna/metrics/handover/versions/__init__.py b/pm4py/algo/enhancement/sna/metrics/handover/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics.handover.versions import classic
diff --git a/.../sna/metrics/handover/versions/classic.py → .../sna/metrics/handover/versions/classic.py b/.../sna/metrics/handover/versions/classic.py → .../sna/metrics/handover/versions/classic.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.transformer.common import rscrsc as rscrsc_utils
+from pm4py.algo.enhancement.sna.transformer.common import rscrsc as rscrsc_utils
 
 
 def apply(mco, parameters=None):

diff --git a/pm4py/algo/enhancement/sna/metrics/real_handover/__init__.py b/pm4py/algo/enhancement/sna/metrics/real_handover/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics.real_handover import factory, versions
diff --git a/...algo/sna/metrics/real_handover/factory.py → ...ment/sna/metrics/real_handover/factory.py b/...algo/sna/metrics/real_handover/factory.py → ...ment/sna/metrics/real_handover/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.metrics.real_handover.versions import classic
+from pm4py.algo.enhancement.sna.metrics.real_handover.versions import classic
 
 CLASSIC = "classic"
 

diff --git a/pm4py/algo/enhancement/sna/metrics/real_handover/versions/__init__.py b/pm4py/algo/enhancement/sna/metrics/real_handover/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics.real_handover.versions import classic
diff --git a/...metrics/real_handover/versions/classic.py → ...metrics/real_handover/versions/classic.py b/...metrics/real_handover/versions/classic.py → ...metrics/real_handover/versions/classic.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.transformer.common import rscrsc as rscrsc_utils
+from pm4py.algo.enhancement.sna.transformer.common import rscrsc as rscrsc_utils
 
 
 def apply(mco, parameters=None):

diff --git a/pm4py/algo/enhancement/sna/metrics/similar_activities/__init__.py b/pm4py/algo/enhancement/sna/metrics/similar_activities/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics.similar_activities import versions, factory
diff --git a/...sna/metrics/similar_activities/factory.py → ...sna/metrics/similar_activities/factory.py b/...sna/metrics/similar_activities/factory.py → ...sna/metrics/similar_activities/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.metrics.similar_activities.versions import classic
+from pm4py.algo.enhancement.sna.metrics.similar_activities.versions import classic
 
 CLASSIC = "classic"
 

diff --git a/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/__init__.py b/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.metrics.similar_activities.versions import classic
diff --git a/...cs/similar_activities/versions/classic.py → ...cs/similar_activities/versions/classic.py b/...cs/similar_activities/versions/classic.py → ...cs/similar_activities/versions/classic.py
@@ -2,8 +2,8 @@
 import pandas as pd
 from _collections import defaultdict
 
-from pm4py.algo.sna.transformer.common import rscact as rscact_utils
-from pm4py.algo.sna.transformer.common import rscrsc as rscrsc_utils
+from pm4py.algo.enhancement.sna.transformer.common import rscact as rscact_utils
+from pm4py.algo.enhancement.sna.transformer.common import rscrsc as rscrsc_utils
 from scipy.stats import pearsonr
 
 

diff --git a/pm4py/algo/enhancement/sna/transformer/__init__.py b/pm4py/algo/enhancement/sna/transformer/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.transformer import common, pandas, tracelog
diff --git a/pm4py/algo/enhancement/sna/transformer/common/__init__.py b/pm4py/algo/enhancement/sna/transformer/common/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.transformer.common import df_utilities
diff --git a/...go/sna/transformer/common/df_utilities.py → ...nt/sna/transformer/common/df_utilities.py b/...go/sna/transformer/common/df_utilities.py → ...nt/sna/transformer/common/df_utilities.py
diff --git a/pm4py/algo/sna/transformer/common/rscact.py → ...ancement/sna/transformer/common/rscact.py b/pm4py/algo/sna/transformer/common/rscact.py → ...ancement/sna/transformer/common/rscact.py
diff --git a/pm4py/algo/sna/transformer/common/rscrsc.py → ...ancement/sna/transformer/common/rscrsc.py b/pm4py/algo/sna/transformer/common/rscrsc.py → ...ancement/sna/transformer/common/rscrsc.py
diff --git a/pm4py/algo/enhancement/sna/transformer/pandas/__init__.py b/pm4py/algo/enhancement/sna/transformer/pandas/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.transformer.pandas import versions, factory
diff --git a/pm4py/algo/sna/transformer/pandas/factory.py → ...ncement/sna/transformer/pandas/factory.py b/pm4py/algo/sna/transformer/pandas/factory.py → ...ncement/sna/transformer/pandas/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.transformer.pandas.versions import basic, full
+from pm4py.algo.enhancement.sna.transformer.pandas.versions import basic, full
 
 BASIC = "basic"
 FULL = "full"

diff --git a/pm4py/algo/enhancement/sna/transformer/pandas/versions/__init__.py b/pm4py/algo/enhancement/sna/transformer/pandas/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.transformer.pandas.versions import full
diff --git a/.../sna/transformer/pandas/versions/basic.py → .../sna/transformer/pandas/versions/basic.py b/.../sna/transformer/pandas/versions/basic.py → .../sna/transformer/pandas/versions/basic.py
@@ -1,6 +1,6 @@
 import pandas as pd
 
-from pm4py.algo.sna.transformer.common import df_utilities
+from pm4py.algo.enhancement.sna.transformer.common import df_utilities
 from pm4py.objects.log.util import xes
 from pm4py.objects.sna.matrix_container import MatrixContainer
 from pm4py.util import constants

diff --git a/...o/sna/transformer/pandas/versions/full.py → ...t/sna/transformer/pandas/versions/full.py b/...o/sna/transformer/pandas/versions/full.py → ...t/sna/transformer/pandas/versions/full.py
@@ -1,6 +1,6 @@
 import pandas as pd
 
-from pm4py.algo.sna.transformer.common import df_utilities
+from pm4py.algo.enhancement.sna.transformer.common import df_utilities
 from pm4py.objects.log.util import xes
 from pm4py.objects.sna.matrix_container import MatrixContainer
 from pm4py.util import constants

diff --git a/pm4py/algo/enhancement/sna/transformer/tracelog/__init__.py b/pm4py/algo/enhancement/sna/transformer/tracelog/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.transformer.tracelog import factory, versions
diff --git a/.../algo/sna/transformer/tracelog/factory.py → ...ement/sna/transformer/tracelog/factory.py b/.../algo/sna/transformer/tracelog/factory.py → ...ement/sna/transformer/tracelog/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.sna.transformer.tracelog.versions import full, basic
+from pm4py.algo.enhancement.sna.transformer.tracelog.versions import full, basic
 
 FULL = "full"
 BASIC = "basic"

diff --git a/pm4py/algo/enhancement/sna/transformer/tracelog/versions/__init__.py b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.enhancement.sna.transformer.tracelog.versions import basic, full
diff --git a/...na/transformer/tracelog/versions/basic.py → ...na/transformer/tracelog/versions/basic.py b/...na/transformer/tracelog/versions/basic.py → ...na/transformer/tracelog/versions/basic.py
@@ -1,6 +1,6 @@
 import pandas as pd
 
-from pm4py.algo.sna.transformer.common import df_utilities
+from pm4py.algo.enhancement.sna.transformer.common import df_utilities
 from pm4py.objects.log.util import xes
 from pm4py.objects.sna.matrix_container import MatrixContainer
 from pm4py.util import constants

diff --git a/...sna/transformer/tracelog/versions/full.py → ...sna/transformer/tracelog/versions/full.py b/...sna/transformer/tracelog/versions/full.py → ...sna/transformer/tracelog/versions/full.py
@@ -1,6 +1,6 @@
 import pandas as pd
 
-from pm4py.algo.sna.transformer.common import df_utilities
+from pm4py.algo.enhancement.sna.transformer.common import df_utilities
 from pm4py.objects.log.util import xes
 from pm4py.objects.sna.matrix_container import MatrixContainer
 from pm4py.util import constants

diff --git a/pm4py/algo/other/__init__.py b/pm4py/algo/other/__init__.py
diff --git a/pm4py/algo/other/playout/__init__.py b/pm4py/algo/other/playout/__init__.py
diff --git a/pm4py/algo/other/playout/versions/__init__.py b/pm4py/algo/other/playout/versions/__init__.py
diff --git a/pm4py/algo/other/simple/__init__.py b/pm4py/algo/other/simple/__init__.py
diff --git a/pm4py/algo/other/simple/filtering/__init__.py b/pm4py/algo/other/simple/filtering/__init__.py
diff --git a/pm4py/algo/other/simple/filtering/pandas/__init__.py b/pm4py/algo/other/simple/filtering/pandas/__init__.py
diff --git a/pm4py/algo/other/simple/filtering/pandas/versions/__init__.py b/pm4py/algo/other/simple/filtering/pandas/versions/__init__.py
diff --git a/pm4py/algo/other/simple/filtering/tracelog/__init__.py b/pm4py/algo/other/simple/filtering/tracelog/__init__.py
diff --git a/pm4py/algo/other/simple/filtering/tracelog/versions/__init__.py b/pm4py/algo/other/simple/filtering/tracelog/versions/__init__.py
diff --git a/pm4py/algo/other/simple/model/__init__.py b/pm4py/algo/other/simple/model/__init__.py
diff --git a/pm4py/algo/other/simple/model/pandas/__init__.py b/pm4py/algo/other/simple/model/pandas/__init__.py
diff --git a/pm4py/algo/other/simple/model/pandas/versions/__init__.py b/pm4py/algo/other/simple/model/pandas/versions/__init__.py
diff --git a/pm4py/algo/other/simple/model/tracelog/__init__.py b/pm4py/algo/other/simple/model/tracelog/__init__.py
diff --git a/pm4py/algo/other/simple/model/tracelog/versions/__init__.py b/pm4py/algo/other/simple/model/tracelog/versions/__init__.py
diff --git a/pm4py/algo/simulation/__init__.py b/pm4py/algo/simulation/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation import simple, playout
diff --git a/pm4py/algo/simulation/playout/__init__.py b/pm4py/algo/simulation/playout/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.playout import factory, data_structures, versions
diff --git a/...other/playout/data_structures/__init__.py → ...ation/playout/data_structures/__init__.py b/...other/playout/data_structures/__init__.py → ...ation/playout/data_structures/__init__.py
diff --git a/pm4py/algo/other/playout/factory.py → pm4py/algo/simulation/playout/factory.py b/pm4py/algo/other/playout/factory.py → pm4py/algo/simulation/playout/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.other.playout.versions import basic_playout
+from pm4py.algo.simulation.playout.versions import basic_playout
 
 BASIC_PLAYOUT = "basic_playout"
 VERSIONS = {BASIC_PLAYOUT: basic_playout.apply}

diff --git a/pm4py/algo/simulation/playout/versions/__init__.py b/pm4py/algo/simulation/playout/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.playout.versions import basic_playout
diff --git a/...o/other/playout/versions/basic_playout.py → ...ulation/playout/versions/basic_playout.py b/...o/other/playout/versions/basic_playout.py → ...ulation/playout/versions/basic_playout.py
diff --git a/pm4py/algo/simulation/simple/__init__.py b/pm4py/algo/simulation/simple/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple import filtering, model
diff --git a/pm4py/algo/simulation/simple/filtering/__init__.py b/pm4py/algo/simulation/simple/filtering/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.filtering import tracelog, pandas
diff --git a/pm4py/algo/simulation/simple/filtering/pandas/__init__.py b/pm4py/algo/simulation/simple/filtering/pandas/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.filtering.pandas import versions, factory
diff --git a/.../other/simple/filtering/pandas/factory.py → ...lation/simple/filtering/pandas/factory.py b/.../other/simple/filtering/pandas/factory.py → ...lation/simple/filtering/pandas/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.other.simple.filtering.pandas.versions import filter_topvariants_soundmodel
+from pm4py.algo.simulation.simple.filtering.pandas.versions import filter_topvariants_soundmodel
 
 TOPVARIANTS_SOUNDMODEL = "topvariants_soundmodel"
 

diff --git a/pm4py/algo/simulation/simple/filtering/pandas/versions/__init__.py b/pm4py/algo/simulation/simple/filtering/pandas/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.filtering.pandas.versions import filter_topvariants_soundmodel
diff --git a/...versions/filter_topvariants_soundmodel.py → ...versions/filter_topvariants_soundmodel.py b/...versions/filter_topvariants_soundmodel.py → ...versions/filter_topvariants_soundmodel.py
diff --git a/pm4py/algo/simulation/simple/filtering/tracelog/__init__.py b/pm4py/algo/simulation/simple/filtering/tracelog/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.filtering.tracelog import versions, factory
diff --git a/...ther/simple/filtering/tracelog/factory.py → ...tion/simple/filtering/tracelog/factory.py b/...ther/simple/filtering/tracelog/factory.py → ...tion/simple/filtering/tracelog/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.other.simple.filtering.tracelog.versions import filter_topvariants_soundmodel
+from pm4py.algo.simulation.simple.filtering.tracelog.versions import filter_topvariants_soundmodel
 
 TOPVARIANTS_SOUNDMODEL = "topvariants_soundmodel"
 

diff --git a/pm4py/algo/simulation/simple/filtering/tracelog/versions/__init__.py b/pm4py/algo/simulation/simple/filtering/tracelog/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.filtering.tracelog.versions import filter_topvariants_soundmodel
diff --git a/...versions/filter_topvariants_soundmodel.py → ...versions/filter_topvariants_soundmodel.py b/...versions/filter_topvariants_soundmodel.py → ...versions/filter_topvariants_soundmodel.py
diff --git a/pm4py/algo/simulation/simple/model/__init__.py b/pm4py/algo/simulation/simple/model/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.model import tracelog, pandas
diff --git a/pm4py/algo/simulation/simple/model/pandas/__init__.py b/pm4py/algo/simulation/simple/model/pandas/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.model.pandas import factory, versions
diff --git a/...algo/other/simple/model/pandas/factory.py → ...simulation/simple/model/pandas/factory.py b/...algo/other/simple/model/pandas/factory.py → ...simulation/simple/model/pandas/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.other.simple.model.pandas.versions import classic
+from pm4py.algo.simulation.simple.model.pandas.versions import classic
 
 CLASSIC = "classic"
 

diff --git a/pm4py/algo/simulation/simple/model/pandas/versions/__init__.py b/pm4py/algo/simulation/simple/model/pandas/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.model.pandas.versions import classic
diff --git a/...r/simple/model/pandas/versions/classic.py → ...n/simple/model/pandas/versions/classic.py b/...r/simple/model/pandas/versions/classic.py → ...n/simple/model/pandas/versions/classic.py
@@ -5,7 +5,7 @@
 from pm4py.algo.filtering.pandas.auto_filter import auto_filter
 from pm4py.algo.filtering.pandas.end_activities import end_activities_filter
 from pm4py.algo.filtering.pandas.start_activities import start_activities_filter
-from pm4py.algo.other.simple.filtering.pandas.versions import filter_topvariants_soundmodel
+from pm4py.algo.simulation.simple.filtering.pandas.versions import filter_topvariants_soundmodel
 from pm4py.objects.log.util.xes import DEFAULT_NAME_KEY
 from pm4py.objects.log.util.xes import DEFAULT_TIMESTAMP_KEY
 from pm4py.util.constants import PARAMETER_CONSTANT_ACTIVITY_KEY

diff --git a/pm4py/algo/simulation/simple/model/tracelog/__init__.py b/pm4py/algo/simulation/simple/model/tracelog/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.model.tracelog import versions, factory
diff --git a/...go/other/simple/model/tracelog/factory.py → ...mulation/simple/model/tracelog/factory.py b/...go/other/simple/model/tracelog/factory.py → ...mulation/simple/model/tracelog/factory.py
@@ -1,4 +1,4 @@
-from pm4py.algo.other.simple.model.tracelog.versions import classic
+from pm4py.algo.simulation.simple.model.tracelog.versions import classic
 
 CLASSIC = "classic"
 

diff --git a/pm4py/algo/simulation/simple/model/tracelog/versions/__init__.py b/pm4py/algo/simulation/simple/model/tracelog/versions/__init__.py
@@ -0,0 +1 @@
+from pm4py.algo.simulation.simple.model.tracelog.versions import classic
diff --git a/...simple/model/tracelog/versions/classic.py → ...simple/model/tracelog/versions/classic.py b/...simple/model/tracelog/versions/classic.py → ...simple/model/tracelog/versions/classic.py
@@ -4,7 +4,7 @@
 from pm4py.algo.filtering.tracelog.auto_filter import auto_filter
 from pm4py.algo.filtering.tracelog.start_activities import start_activities_filter
 from pm4py.algo.filtering.tracelog.end_activities import end_activities_filter
-from pm4py.algo.other.simple.filtering.tracelog.versions import filter_topvariants_soundmodel
+from pm4py.algo.simulation.simple.filtering.tracelog.versions import filter_topvariants_soundmodel
 from pm4py.objects.log.util import insert_classifier
 from pm4py.objects.log.util.xes import DEFAULT_NAME_KEY
 from pm4py.util.constants import PARAMETER_CONSTANT_ATTRIBUTE_KEY, PARAMETER_CONSTANT_ACTIVITY_KEY

diff --git a/pm4py/algo/sna/__init__.py b/pm4py/algo/sna/__init__.py
diff --git a/pm4py/algo/sna/metrics/__init__.py b/pm4py/algo/sna/metrics/__init__.py
diff --git a/pm4py/algo/sna/metrics/handover/__init__.py b/pm4py/algo/sna/metrics/handover/__init__.py
diff --git a/pm4py/algo/sna/metrics/handover/versions/__init__.py b/pm4py/algo/sna/metrics/handover/versions/__init__.py
diff --git a/pm4py/algo/sna/metrics/real_handover/__init__.py b/pm4py/algo/sna/metrics/real_handover/__init__.py
diff --git a/pm4py/algo/sna/metrics/real_handover/versions/__init__.py b/pm4py/algo/sna/metrics/real_handover/versions/__init__.py
diff --git a/pm4py/algo/sna/metrics/similar_activities/__init__.py b/pm4py/algo/sna/metrics/similar_activities/__init__.py
diff --git a/pm4py/algo/sna/metrics/similar_activities/versions/__init__.py b/pm4py/algo/sna/metrics/similar_activities/versions/__init__.py
diff --git a/pm4py/algo/sna/transformer/__init__.py b/pm4py/algo/sna/transformer/__init__.py
diff --git a/pm4py/algo/sna/transformer/common/__init__.py b/pm4py/algo/sna/transformer/common/__init__.py
diff --git a/pm4py/algo/sna/transformer/pandas/__init__.py b/pm4py/algo/sna/transformer/pandas/__init__.py
diff --git a/pm4py/algo/sna/transformer/pandas/versions/__init__.py b/pm4py/algo/sna/transformer/pandas/versions/__init__.py
diff --git a/pm4py/algo/sna/transformer/tracelog/__init__.py b/pm4py/algo/sna/transformer/tracelog/__init__.py
diff --git a/pm4py/algo/sna/transformer/tracelog/versions/__init__.py b/pm4py/algo/sna/transformer/tracelog/versions/__init__.py
diff --git a/pm4py/objects/petri/check_soundness.py b/pm4py/objects/petri/check_soundness.py
@@ -8,7 +8,7 @@
 
 def check_source_and_sink_reachability(net, unique_source, unique_sink):
     """
-    Checks reachability of the source and the sink place from all other nodes (places/transitions)
+    Checks reachability of the source and the sink place from all simulation nodes (places/transitions)
     of the Petri net
 
     Parameters

diff --git a/pm4py/objects/petri/reachability_graph.py b/pm4py/objects/petri/reachability_graph.py
@@ -8,7 +8,7 @@
 def staterep(name):
     """
     Creates a string representation for a state of a transition system.
-    Necessary because graphviz does not support symbols other than alphanimerics and '_'.
+    Necessary because graphviz does not support symbols simulation than alphanimerics and '_'.
     TODO: find a better representation.
 
     Parameters

diff --git a/setup.py b/setup.py
@@ -19,20 +19,20 @@ def read_file(filename):
     author_email=pm4py.__author_email__,
     py_modules=[pm4py.__name__],
     include_package_data=True,
-    packages=['pm4py', 'pm4py.algo', 'pm4py.algo.sna', 'pm4py.algo.sna.metrics', 'pm4py.algo.sna.metrics.handover',
-              'pm4py.algo.sna.metrics.handover.versions', 'pm4py.algo.sna.metrics.real_handover',
-              'pm4py.algo.sna.metrics.real_handover.versions', 'pm4py.algo.sna.metrics.similar_activities',
-              'pm4py.algo.sna.metrics.similar_activities.versions', 'pm4py.algo.sna.transformer',
-              'pm4py.algo.sna.transformer.common', 'pm4py.algo.sna.transformer.pandas',
-              'pm4py.algo.sna.transformer.pandas.versions', 'pm4py.algo.sna.transformer.tracelog',
-              'pm4py.algo.sna.transformer.tracelog.versions', 'pm4py.algo.other', 'pm4py.algo.other.simple',
-              'pm4py.algo.other.simple.model', 'pm4py.algo.other.simple.model.pandas',
-              'pm4py.algo.other.simple.model.pandas.versions', 'pm4py.algo.other.simple.model.tracelog',
-              'pm4py.algo.other.simple.model.tracelog.versions', 'pm4py.algo.other.simple.filtering',
-              'pm4py.algo.other.simple.filtering.pandas', 'pm4py.algo.other.simple.filtering.pandas.versions',
-              'pm4py.algo.other.simple.filtering.tracelog', 'pm4py.algo.other.simple.filtering.tracelog.versions',
-              'pm4py.algo.other.playout', 'pm4py.algo.other.playout.versions',
-              'pm4py.algo.other.playout.data_structures', 'pm4py.algo.discovery', 'pm4py.algo.discovery.dfg',
+    packages=['pm4py', 'pm4py.algo', 'pm4py.algo.enhancement.sna', 'pm4py.algo.enhancement.sna.metrics', 'pm4py.algo.enhancement.sna.metrics.handover',
+              'pm4py.algo.enhancement.sna.metrics.handover.versions', 'pm4py.algo.enhancement.sna.metrics.real_handover',
+              'pm4py.algo.enhancement.sna.metrics.real_handover.versions', 'pm4py.algo.enhancement.sna.metrics.similar_activities',
+              'pm4py.algo.enhancement.sna.metrics.similar_activities.versions', 'pm4py.algo.enhancement.sna.transformer',
+              'pm4py.algo.enhancement.sna.transformer.common', 'pm4py.algo.enhancement.sna.transformer.pandas',
+              'pm4py.algo.enhancement.sna.transformer.pandas.versions', 'pm4py.algo.enhancement.sna.transformer.tracelog',
+              'pm4py.algo.enhancement.sna.transformer.tracelog.versions', 'pm4py.algo.simulation', 'pm4py.algo.simulation.simple',
+              'pm4py.algo.simulation.simple.model', 'pm4py.algo.simulation.simple.model.pandas',
+              'pm4py.algo.simulation.simple.model.pandas.versions', 'pm4py.algo.simulation.simple.model.tracelog',
+              'pm4py.algo.simulation.simple.model.tracelog.versions', 'pm4py.algo.simulation.simple.filtering',
+              'pm4py.algo.simulation.simple.filtering.pandas', 'pm4py.algo.simulation.simple.filtering.pandas.versions',
+              'pm4py.algo.simulation.simple.filtering.tracelog', 'pm4py.algo.simulation.simple.filtering.tracelog.versions',
+              'pm4py.algo.simulation.playout', 'pm4py.algo.simulation.playout.versions',
+              'pm4py.algo.simulation.playout.data_structures', 'pm4py.algo.discovery', 'pm4py.algo.discovery.dfg',
               'pm4py.algo.discovery.dfg.utils', 'pm4py.algo.discovery.dfg.adapters',
               'pm4py.algo.discovery.dfg.adapters.pandas', 'pm4py.algo.discovery.dfg.versions',
               'pm4py.algo.discovery.alpha', 'pm4py.algo.discovery.alpha.utils', 'pm4py.algo.discovery.alpha.versions',

diff --git a/simulation_df.py b/simulation_df.py
@@ -3,7 +3,7 @@
 from pm4py.algo.discovery.dfg.adapters.pandas import df_statistics
 from pm4py.algo.filtering.common.filtering_constants import CASE_CONCEPT_NAME
 from pm4py.algo.filtering.pandas.attributes import attributes_filter
-from pm4py.algo.other.simple.model.pandas import factory as model_factory
+from pm4py.algo.simulation.simple.model.pandas import factory as model_factory
 from pm4py.objects.log.importer.csv.versions import pandas_df_imp
 from pm4py.objects.log.util.xes import DEFAULT_NAME_KEY
 from pm4py.objects.log.util.xes import DEFAULT_TIMESTAMP_KEY

diff --git a/tests/pm_extr_test/simple_test.py b/tests/pm_extr_test/simple_test.py
@@ -11,7 +11,7 @@
     from pm4py.objects.log.importer.xes import factory as xes_factory
     from pm4py.objects.petri.exporter import pnml as pnml_exporter
     from pm4py.visualization.petrinet import factory as petri_vis_factory
-    from pm4py.algo.other.simple.model.tracelog import factory as simple_model_factory
+    from pm4py.algo.simulation.simple.model.tracelog import factory as simple_model_factory
 
     logFolder = os.path.join("..", "compressed_input_data")
     pnmlFolder = "simple_pnml"

diff --git a/tests/simple_execution.py b/tests/simple_execution.py
@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from pm4py.algo.other.simple.model.tracelog import factory as simple_model_factory
+from pm4py.algo.simulation.simple.model.tracelog import factory as simple_model_factory
 from pm4py.objects.log.importer.xes import factory as xes_importer
 from tests.constants import INPUT_DATA_DIR
 

diff --git a/tests/sna_tests.py b/tests/sna_tests.py
@@ -1,11 +1,11 @@
 import os
 import unittest
 
-from pm4py.algo.sna.metrics.handover import factory as handover_of_work
-from pm4py.algo.sna.metrics.real_handover import factory as real_handover_of_work
-from pm4py.algo.sna.metrics.similar_activities import factory as similar_activities
-from pm4py.algo.sna.transformer.pandas import factory as sna_transformer_df
-from pm4py.algo.sna.transformer.tracelog import factory as sna_transformer
+from pm4py.algo.enhancement.sna.metrics.handover import factory as handover_of_work
+from pm4py.algo.enhancement.sna.metrics.real_handover import factory as real_handover_of_work
+from pm4py.algo.enhancement.sna.metrics.similar_activities import factory as similar_activities
+from pm4py.algo.enhancement.sna.transformer.pandas import factory as sna_transformer_df
+from pm4py.algo.enhancement.sna.transformer.tracelog import factory as sna_transformer
 from pm4py.objects.log.adapters.pandas import csv_import_adapter
 from pm4py.objects.log.importer.xes import factory as xes_importer
 from pm4py.visualization.sna import factory as sna_vis_factory