diff --git a/gso/products/product_blocks/site.py b/gso/products/product_blocks/site.py
index 888c874e2b20731b8b8da20a527165f2d6c29db3..1dae1b582505ec0824bb9da67d9f3eef6d6507cc 100644
--- a/gso/products/product_blocks/site.py
+++ b/gso/products/product_blocks/site.py
@@ -23,10 +23,10 @@ class SiteTier(strEnum):
 class SnmpCoordinate(ConstrainedStr):
     """An {term}`SNMP` coordinate, modeled as a constrained string.
 
-    The coordinate must match the format of `1.35`, `-12.3456`, etc.
+    The coordinate must match the format of `1.35`, `-123.456`, etc.
     """
 
-    regex = re.compile(r"^-?\d{1,2}\.\d+$")
+    regex = re.compile(r"^-?\d{1,3}\.\d+$")
 
 
 class SiteBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="SiteBlock"):
diff --git a/gso/workflows/iptrunk/__init__.py b/gso/workflows/iptrunk/__init__.py
index 59eb58a8962f6d9ffe7b822696732c300b47e0ea..091846365a88bdaab93d02632d6a8b6eac0c1e0a 100644
--- a/gso/workflows/iptrunk/__init__.py
+++ b/gso/workflows/iptrunk/__init__.py
@@ -2,7 +2,8 @@ from logging import getLogger
 
 from orchestrator import step
 from orchestrator.types import State
-from gso.products import Iptrunk
+
+from gso.products.product_types.iptrunk import Iptrunk
 
 logger = getLogger(__name__)
 
diff --git a/gso/workflows/iptrunk/migrate_iptrunk.py b/gso/workflows/iptrunk/migrate_iptrunk.py
index 6c3ddd68cac4c275b2d19189cbc65e30b32907d6..f87b625d77e8d89b0d95b50865e6d6ef0d0f10e6 100644
--- a/gso/workflows/iptrunk/migrate_iptrunk.py
+++ b/gso/workflows/iptrunk/migrate_iptrunk.py
@@ -12,8 +12,10 @@ from orchestrator.types import FormGenerator, State, UUIDstr
 from orchestrator.workflow import StepList, done, init, inputstep
 from orchestrator.workflows.steps import resync, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
-from gso.products import Iptrunk, Router
 from pydantic import validator
+
+from gso.products.product_types.iptrunk import Iptrunk
+from gso.products.product_types.router import Router
 from gso.services import provisioning_proxy
 from gso.services.provisioning_proxy import pp_interaction
 from gso.workflows.iptrunk import restore_isis_metric, set_isis_to_9000
diff --git a/gso/workflows/site/create_site.py b/gso/workflows/site/create_site.py
index f787cbc4d9e15c0ea4d940f63605f786e34cf32a..b2e7406aaa9ffa868ffd201fe37c7d8e06f6b917 100644
--- a/gso/workflows/site/create_site.py
+++ b/gso/workflows/site/create_site.py
@@ -8,10 +8,10 @@ from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUID
 from orchestrator.workflow import StepList, done, init, step, workflow
 from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
-from gso.products.product_blocks.site import SnmpCoordinate
 from pydantic import validator
 
 from gso.products.product_blocks import site as site_pb
+from gso.products.product_blocks.site import SnmpCoordinate
 from gso.products.product_types import site
 from gso.workflows.utils import customer_selector