diff --git a/src/ifcbimtester/bimtester/features/steps/all.py b/src/ifcbimtester/bimtester/features/steps/all.py
index 9ace4b10f1..d3b03a3159 100644
--- a/src/ifcbimtester/bimtester/features/steps/all.py
+++ b/src/ifcbimtester/bimtester/features/steps/all.py
@@ -31,3 +31,5 @@ from bimtester.features.steps.model_federation import en
 use_step_matcher("parse")
 from bimtester.features.steps.project_setup import de, en, fr, it, nl
 
+use_step_matcher("parse")
+from bimtester.features.steps.spatial_structure import en
diff --git a/src/ifcbimtester/examples/steps/spatial_structure.py b/src/ifcbimtester/bimtester/features/steps/spatial_structure/en.py
similarity index 51%
rename from src/ifcbimtester/examples/steps/spatial_structure.py
rename to src/ifcbimtester/bimtester/features/steps/spatial_structure/en.py
index ef96979639..2961ed16bc 100644
--- a/src/ifcbimtester/examples/steps/spatial_structure.py
+++ b/src/ifcbimtester/bimtester/features/steps/spatial_structure/en.py
@@ -1,10 +1,11 @@
 from behave import step
 
-from utils import IfcFile
+from bimtester.ifc import IfcStore
+from bimtester.lang import _
 
 
-@step("all buildings have an address")
+@step('All buildings have an address')
 def step_impl(context):
-    for building in IfcFile.get().by_type("IfcBuilding"):
+    for building in IfcStore.file.by_type("IfcBuilding"):
         if not building.BuildingAddress:
             assert False, f'The building "{building.Name}" has no address.'