diff --git a/src/telemetry_frontend/__init__.py b/src/telemetry/__init__.py
similarity index 100%
rename from src/telemetry_frontend/__init__.py
rename to src/telemetry/__init__.py
diff --git a/src/telemetry_frontend/backend/__init__.py b/src/telemetry/backend/__init__.py
similarity index 100%
rename from src/telemetry_frontend/backend/__init__.py
rename to src/telemetry/backend/__init__.py
diff --git a/src/telemetry_frontend/backend/service/KafkaProducerService.py b/src/telemetry/backend/service/KafkaProducerService.py
similarity index 100%
rename from src/telemetry_frontend/backend/service/KafkaProducerService.py
rename to src/telemetry/backend/service/KafkaProducerService.py
diff --git a/src/telemetry_frontend/backend/service/KafkaProducerServiceImpl.py b/src/telemetry/backend/service/KafkaProducerServiceImpl.py
similarity index 100%
rename from src/telemetry_frontend/backend/service/KafkaProducerServiceImpl.py
rename to src/telemetry/backend/service/KafkaProducerServiceImpl.py
diff --git a/src/telemetry_frontend/backend/service/__init__.py b/src/telemetry/backend/service/__init__.py
similarity index 100%
rename from src/telemetry_frontend/backend/service/__init__.py
rename to src/telemetry/backend/service/__init__.py
diff --git a/src/telemetry_frontend/backend/tests/__init__.py b/src/telemetry/backend/tests/__init__.py
similarity index 100%
rename from src/telemetry_frontend/backend/tests/__init__.py
rename to src/telemetry/backend/tests/__init__.py
diff --git a/src/telemetry_frontend/backend/tests/messagesBackend.py b/src/telemetry/backend/tests/messagesBackend.py
similarity index 100%
rename from src/telemetry_frontend/backend/tests/messagesBackend.py
rename to src/telemetry/backend/tests/messagesBackend.py
diff --git a/src/telemetry_frontend/backend/tests/test_kafka_backend.py b/src/telemetry/backend/tests/test_kafka_backend.py
similarity index 87%
rename from src/telemetry_frontend/backend/tests/test_kafka_backend.py
rename to src/telemetry/backend/tests/test_kafka_backend.py
index e64a65ccdf0d3482928face80f42cc7fb6ec196b..05174da2b2886801f2127f817b2f3fc0d4e29797 100644
--- a/src/telemetry_frontend/backend/tests/test_kafka_backend.py
+++ b/src/telemetry/backend/tests/test_kafka_backend.py
@@ -17,9 +17,9 @@
import logging
from typing import Tuple
from common.proto.context_pb2 import Empty
-from src.telemetry_frontend.tests.Messages import create_collector_request, create_collector_id
-from src.telemetry_frontend.backend.service.KafkaProducerService import KafkaProducerService
-from src.telemetry_frontend.backend.service.KafkaProducerServiceImpl import KafkaProducerServiceImpl
+from src.telemetry.frontend.tests.Messages import create_collector_request, create_collector_id
+from src.telemetry.backend.service.KafkaProducerService import KafkaProducerService
+from src.telemetry.backend.service.KafkaProducerServiceImpl import KafkaProducerServiceImpl
LOGGER = logging.getLogger(__name__)
diff --git a/src/telemetry/frontend/__init__.py b/src/telemetry/frontend/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a8f397461ef6ef2fbcf09b6078482c2df954a1e
--- /dev/null
+++ b/src/telemetry/frontend/__init__.py
@@ -0,0 +1,15 @@
+
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
diff --git a/src/telemetry_frontend/client/TelemetryFrontendClient.py b/src/telemetry/frontend/client/TelemetryFrontendClient.py
similarity index 100%
rename from src/telemetry_frontend/client/TelemetryFrontendClient.py
rename to src/telemetry/frontend/client/TelemetryFrontendClient.py
diff --git a/src/telemetry_frontend/client/__init__.py b/src/telemetry/frontend/client/__init__.py
similarity index 100%
rename from src/telemetry_frontend/client/__init__.py
rename to src/telemetry/frontend/client/__init__.py
diff --git a/src/telemetry_frontend/service/TelemetryFrontendService.py b/src/telemetry/frontend/service/TelemetryFrontendService.py
similarity index 95%
rename from src/telemetry_frontend/service/TelemetryFrontendService.py
rename to src/telemetry/frontend/service/TelemetryFrontendService.py
index a0ae704d3564e21dbca22d44d5a60b75a636fbdc..522d125e6f7d01ecd603c761db1461b35c6d614a 100644
--- a/src/telemetry_frontend/service/TelemetryFrontendService.py
+++ b/src/telemetry/frontend/service/TelemetryFrontendService.py
@@ -17,7 +17,7 @@ from common.Settings import get_service_port_grpc
from monitoring.service.NameMapping import NameMapping
from common.tools.service.GenericGrpcService import GenericGrpcService
from common.proto.telemetry_frontend_pb2_grpc import add_TelemetryFrontendServiceServicer_to_server
-from telemetry_frontend.service.TelemetryFrontendServiceServicerImpl import TelemetryFrontendServiceServicerImpl
+from telemetry.frontend.service.TelemetryFrontendServiceServicerImpl import TelemetryFrontendServiceServicerImpl
class TelemetryFrontendService(GenericGrpcService):
diff --git a/src/telemetry_frontend/service/TelemetryFrontendServiceServicerImpl.py b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
similarity index 100%
rename from src/telemetry_frontend/service/TelemetryFrontendServiceServicerImpl.py
rename to src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
diff --git a/src/telemetry_frontend/service/__init__.py b/src/telemetry/frontend/service/__init__.py
similarity index 100%
rename from src/telemetry_frontend/service/__init__.py
rename to src/telemetry/frontend/service/__init__.py
diff --git a/src/telemetry_frontend/tests/Messages.py b/src/telemetry/frontend/tests/Messages.py
similarity index 100%
rename from src/telemetry_frontend/tests/Messages.py
rename to src/telemetry/frontend/tests/Messages.py
diff --git a/src/telemetry_frontend/tests/__init__.py b/src/telemetry/frontend/tests/__init__.py
similarity index 100%
rename from src/telemetry_frontend/tests/__init__.py
rename to src/telemetry/frontend/tests/__init__.py
diff --git a/src/telemetry_frontend/tests/test_unitary.py b/src/telemetry/frontend/tests/test_unitary.py
similarity index 97%
rename from src/telemetry_frontend/tests/test_unitary.py
rename to src/telemetry/frontend/tests/test_unitary.py
index 68467590fec38f95cbacd4ccf1eb62069e6f79cb..312695659783a0ec59e0163605a857760cd0d2cb 100644
--- a/src/telemetry_frontend/tests/test_unitary.py
+++ b/src/telemetry/frontend/tests/test_unitary.py
@@ -27,9 +27,9 @@ from common.tests.MockServicerImpl_Context import MockServicerImpl_Context
from common.Settings import (
get_service_port_grpc, get_env_var_name, ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC)
-from telemetry_frontend.client.TelemetryFrontendClient import TelemetryFrontendClient
-from telemetry_frontend.service.TelemetryFrontendService import TelemetryFrontendService
-from telemetry_frontend.tests.Messages import ( create_collector_id, create_collector_request,
+from telemetry.frontend.client.TelemetryFrontendClient import TelemetryFrontendClient
+from telemetry.frontend.service.TelemetryFrontendService import TelemetryFrontendService
+from telemetry.frontend.tests.Messages import ( create_collector_id, create_collector_request,
create_collector_filter, create_collector_request_a, create_collector_request_b)
from device.client.DeviceClient import DeviceClient
diff --git a/src/telemetry_frontend/requirements.in b/src/telemetry/requirements.in
similarity index 100%
rename from src/telemetry_frontend/requirements.in
rename to src/telemetry/requirements.in
diff --git a/src/telemetry_frontend/telemetry_virenv.txt b/src/telemetry/telemetry_virenv.txt
similarity index 100%
rename from src/telemetry_frontend/telemetry_virenv.txt
rename to src/telemetry/telemetry_virenv.txt
diff --git a/src/telemetry_frontend/service/__main__.py b/src/telemetry_frontend/service/__main__.py
deleted file mode 100644
index 9b5fe70deefa7f6b558805b7a5b54261f9546267..0000000000000000000000000000000000000000
--- a/src/telemetry_frontend/service/__main__.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import logging, threading
-from .TelemetryFrontendService import TelemetryFrontendService
-from monitoring.service.NameMapping import NameMapping
-from monitoring.service.EventTools import EventsDeviceCollector
-from common.Settings import (
- get_log_level, wait_for_environment_variables, get_env_var_name,
- get_metrics_port )
-
-terminate = threading.Event()
-LOGGER = None
-
-def signal_handler(signal, frame): # pylint: disable=redefined-outer-name
- LOGGER.warning('Terminate signal received')
- terminate.set()
-
-def main():
- global LOGGER
-
- log_level = get_log_level()
- logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s")
- LOGGER = logging.getLogger(__name__)
-
-# ------- will be added later --------------
- # wait_for_environment_variables([
- # get_env_var_name
-
-
- # ])
-# ------- will be added later --------------
-
- signal.signal(signal.SIGINT, signal_handler)
- signal.signal(signal.SIGTERM, signal_handler)
-
- LOGGER.info('Starting...')
-
- # Start metrics server
- metrics_port = get_metrics_port()
- start_http_server(metrics_port)
-
- name_mapping = NameMapping()
-
- grpc_service = TelemetryFrontendService(name_mapping)
- grpc_service.start()
-
- # Wait for Ctrl+C or termination signal
- while not terminate.wait(timeout=1.0): pass
-
- LOGGER.info('Terminating...')
- grpc_service.stop()
-
- LOGGER.info('Bye')
- return 0
-
-if __name__ == '__main__':
- sys.exit(main())
\ No newline at end of file