diff --git a/src/opengeodeweb_viewer/generic/generic_protocols.py b/src/opengeodeweb_viewer/rpc/generic/generic_protocols.py
similarity index 97%
rename from src/opengeodeweb_viewer/generic/generic_protocols.py
rename to src/opengeodeweb_viewer/rpc/generic/generic_protocols.py
index fb9a5bb..e8d8ec0 100644
--- a/src/opengeodeweb_viewer/generic/generic_protocols.py
+++ b/src/opengeodeweb_viewer/rpc/generic/generic_protocols.py
@@ -14,7 +14,7 @@
 from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
 
 class VtkGenericView(VtkView):
-    prefix = "opengeodeweb_viewer."
+    prefix = "opengeodeweb_viewer.generic."
     schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
 
     def __init__(self, mesh_protocols, model_protocols):
@@ -45,3 +45,4 @@ def deregister(self, params):
         elif viewer_object == "model":
             self.model_protocols.deregisterModel(params)
 
+
diff --git a/src/opengeodeweb_viewer/generic/schemas/deregister.json b/src/opengeodeweb_viewer/rpc/generic/schemas/deregister.json
similarity index 100%
rename from src/opengeodeweb_viewer/generic/schemas/deregister.json
rename to src/opengeodeweb_viewer/rpc/generic/schemas/deregister.json
diff --git a/src/opengeodeweb_viewer/generic/schemas/register.json b/src/opengeodeweb_viewer/rpc/generic/schemas/register.json
similarity index 100%
rename from src/opengeodeweb_viewer/generic/schemas/register.json
rename to src/opengeodeweb_viewer/rpc/generic/schemas/register.json
diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py
index 186f33d..067459d 100644
--- a/src/opengeodeweb_viewer/vtkw_server.py
+++ b/src/opengeodeweb_viewer/vtkw_server.py
@@ -15,7 +15,7 @@
 from .rpc.viewer.viewer_protocols import VtkViewerView
 from .rpc.mesh.mesh_protocols import VtkMeshView
 from .rpc.model.model_protocols import VtkModelView
-from .generic.generic_protocols import VtkGenericView
+from .rpc.generic.generic_protocols import VtkGenericView
 
 
 # =============================================================================
diff --git a/src/tests/test_generic_protocols.py b/src/tests/test_generic_protocols.py
index ef376db..5c1f27c 100644
--- a/src/tests/test_generic_protocols.py
+++ b/src/tests/test_generic_protocols.py
@@ -1,4 +1,4 @@
-from opengeodeweb_viewer.generic.generic_protocols import VtkGenericView
+from opengeodeweb_viewer.rpc.generic.generic_protocols import VtkGenericView
 
 def test_register_mesh(server):
     server.call(VtkGenericView.prefix + VtkGenericView.schemas_dict["register"]["rpc"], [{"viewer_object": "mesh", "id": "123456789", "file_name": "hat.vtp"}])