diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/__init__.py b/server/lib/python/cartodb_services/cartodb_services/tools/__init__.py
index 21c213b..976469a 100644
--- a/server/lib/python/cartodb_services/cartodb_services/tools/__init__.py
+++ b/server/lib/python/cartodb_services/cartodb_services/tools/__init__.py
@@ -3,6 +3,7 @@ from coordinates import Coordinate
 from polyline import PolyLine
 from log import Logger, LoggerConfig
 from rate_limiter import RateLimiter
-from service_manager import ServiceManager, RateLimitExceeded
+from service_manager import ServiceManager
 from legacy_service_manager import LegacyServiceManager
 from exceptions import QuotaExceededException, RateLimitExceeded
+from country import country_to_iso3
diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py b/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py
index a8fa711..4dd8f9a 100644
--- a/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py
+++ b/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py
@@ -1,7 +1,7 @@
 from cartodb_services.metrics import QuotaService
-from cartodb_services.tools import Logger
-from cartodb_services.tools import RateLimiter
-from cartodb_services.tools import QuotaExceededException, RateLimitExceeded
+from cartodb_services.tools.log import Logger
+from cartodb_services.tools.rate_limiter import RateLimiter
+from cartodb_services.tools.exceptions import QuotaExceededException, RateLimitExceeded
 from cartodb_services.refactor.tools.logger import LoggerConfigBuilder
 from cartodb_services.refactor.backend.redis_metrics_connection import RedisMetricsConnectionFactory
 from cartodb_services.config import ServiceConfiguration, RateLimitsConfigBuilder