diff --git a/shaketune/macros/K-SnT_vibrations.cfg b/shaketune/measurement/K-SnT_vibrations.cfg
similarity index 100%
rename from shaketune/macros/K-SnT_vibrations.cfg
rename to shaketune/measurement/K-SnT_vibrations.cfg
diff --git a/shaketune/macros/__init__.py b/shaketune/measurement/__init__.py
similarity index 100%
rename from shaketune/macros/__init__.py
rename to shaketune/measurement/__init__.py
diff --git a/shaketune/macros/accelerometer.py b/shaketune/measurement/accelerometer.py
similarity index 100%
rename from shaketune/macros/accelerometer.py
rename to shaketune/measurement/accelerometer.py
diff --git a/shaketune/macros/axes_input_shaper.py b/shaketune/measurement/axes_input_shaper.py
similarity index 100%
rename from shaketune/macros/axes_input_shaper.py
rename to shaketune/measurement/axes_input_shaper.py
diff --git a/shaketune/macros/axes_map.py b/shaketune/measurement/axes_map.py
similarity index 100%
rename from shaketune/macros/axes_map.py
rename to shaketune/measurement/axes_map.py
diff --git a/shaketune/macros/belts_comparison.py b/shaketune/measurement/belts_comparison.py
similarity index 100%
rename from shaketune/macros/belts_comparison.py
rename to shaketune/measurement/belts_comparison.py
diff --git a/shaketune/macros/resonance_test.py b/shaketune/measurement/resonance_test.py
similarity index 100%
rename from shaketune/macros/resonance_test.py
rename to shaketune/measurement/resonance_test.py
diff --git a/shaketune/macros/static_freq.py b/shaketune/measurement/static_freq.py
similarity index 100%
rename from shaketune/macros/static_freq.py
rename to shaketune/measurement/static_freq.py
diff --git a/shaketune/graph_creators/__init__.py b/shaketune/post_processing/__init__.py
similarity index 100%
rename from shaketune/graph_creators/__init__.py
rename to shaketune/post_processing/__init__.py
diff --git a/shaketune/graph_creators/analyze_axesmap.py b/shaketune/post_processing/analyze_axesmap.py
similarity index 100%
rename from shaketune/graph_creators/analyze_axesmap.py
rename to shaketune/post_processing/analyze_axesmap.py
diff --git a/shaketune/graph_creators/graph_belts.py b/shaketune/post_processing/graph_belts.py
similarity index 100%
rename from shaketune/graph_creators/graph_belts.py
rename to shaketune/post_processing/graph_belts.py
diff --git a/shaketune/graph_creators/graph_creator.py b/shaketune/post_processing/graph_creator.py
similarity index 100%
rename from shaketune/graph_creators/graph_creator.py
rename to shaketune/post_processing/graph_creator.py
diff --git a/shaketune/graph_creators/graph_shaper.py b/shaketune/post_processing/graph_shaper.py
similarity index 100%
rename from shaketune/graph_creators/graph_shaper.py
rename to shaketune/post_processing/graph_shaper.py
diff --git a/shaketune/graph_creators/graph_vibrations.py b/shaketune/post_processing/graph_vibrations.py
similarity index 100%
rename from shaketune/graph_creators/graph_vibrations.py
rename to shaketune/post_processing/graph_vibrations.py
diff --git a/shaketune/graph_creators/klippain.png b/shaketune/post_processing/klippain.png
similarity index 100%
rename from shaketune/graph_creators/klippain.png
rename to shaketune/post_processing/klippain.png
diff --git a/shaketune/shaketune.py b/shaketune/shaketune.py
index 17ff7bf..1c6ffe5 100644
--- a/shaketune/shaketune.py
+++ b/shaketune/shaketune.py
@@ -3,9 +3,9 @@
 
 from pathlib import Path
 
-from .graph_creators import AxesMapFinder, BeltsGraphCreator, ShaperGraphCreator
 from .helpers.console_output import ConsoleOutput
-from .macros import axes_map_calibration, axes_shaper_calibration, compare_belts_responses, excitate_axis_at_freq
+from .measurement import axes_map_calibration, axes_shaper_calibration, compare_belts_responses, excitate_axis_at_freq
+from .post_processing import AxesMapFinder, BeltsGraphCreator, ShaperGraphCreator
 from .shaketune_config import ShakeTuneConfig
 from .shaketune_thread import ShakeTuneThread