diff --git a/example_python/generate_parameter_module_example/minimal_publisher.py b/example_python/examples/minimal_publisher.py
similarity index 100%
rename from example_python/generate_parameter_module_example/minimal_publisher.py
rename to example_python/examples/minimal_publisher.py
diff --git a/example_python/generate_parameter_module_example/__init__.py b/example_python/generate_parameter_module_example/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/example_python/setup.py b/example_python/setup.py
index c757ec8c..d261bad1 100644
--- a/example_python/setup.py
+++ b/example_python/setup.py
@@ -11,7 +11,7 @@
     # set module_name and yaml file
     module_name = 'admittance_parameters'
     yaml_file = 'generate_parameter_module_example/parameters.yaml'
-    validation_module = 'generate_parameter_module_example.custom_validation'
+    validation_module = 'validators.custom_validation'
     generate_parameter_module(
         module_name, yaml_file, validation_module=validation_module
     )
@@ -33,7 +33,7 @@
     tests_require=['pytest'],
     entry_points={
         'console_scripts': [
-            'test_node = generate_parameter_module_example.minimal_publisher:main'
+            'test_node = examples.minimal_publisher:main'
         ],
     },
 )
diff --git a/example_python/test/test_parameters.py b/example_python/test/test_parameters.py
new file mode 100644
index 00000000..a5a5ddcc
--- /dev/null
+++ b/example_python/test/test_parameters.py
@@ -0,0 +1,7 @@
+import generate_parameter_module_example
+print(f'Imported file from: {generate_parameter_module_example.__file__}')
+print('OK 1')
+
+import generate_parameter_module_example.admittance_parameters  # noqa: E402
+
+print('OK 2')
diff --git a/example_python/generate_parameter_module_example/custom_validation.py b/example_python/validators/custom_validation.py
similarity index 100%
rename from example_python/generate_parameter_module_example/custom_validation.py
rename to example_python/validators/custom_validation.py
diff --git a/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py b/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
index 4149223e..ed4de8e3 100644
--- a/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
+++ b/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
@@ -55,6 +55,7 @@ def generate_parameter_module(module_name, yaml_file, validation_module=''):
             install_dir = os.path.join(
                 colcon_ws,
                 'install',
+                pkg_name,
                 'lib',
                 py_version,
                 'site-packages',