diff --git a/FieldMapping.csv b/FieldMapping.csv
deleted file mode 100644
index 84b3fd7..0000000
--- a/FieldMapping.csv
+++ /dev/null
@@ -1 +0,0 @@
-ObjectName,FieldName,Target
\ No newline at end of file
diff --git a/export.json b/export.json
deleted file mode 100644
index 6590845..0000000
--- a/export.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "objects": [
-        {
-            "query": "SELECT address_identifier, City, Country, PostalCode, Street, Latitude, Longitude, CountryCode FROM Address",
-            "operation": "Insert",
-            "externalId": "address_identifier",
-            "useFieldMapping": true,
-            "fieldMapping": [
-                {
-                    "targetObject": "Address"
-                },
-                {
-                    "sourceField": "City",
-                    "targetField": "City"
-                },
-                {
-                    "sourceField": "Country",
-                    "targetField": "Country"
-                },
-                {
-                    "sourceField": "PostalCode",
-                    "targetField": "PostalCode"
-                },
-                {
-                    "sourceField": "Street",
-                    "targetField": "Street"
-                },
-                {
-                    "sourceField": "Latitude",
-                    "targetField": "Latitude"
-                },
-                {
-                    "sourceField": "Longitude",
-                    "targetField": "Longitude"
-                },
-                {
-                    "sourceField": "CountryCode",
-                    "targetField": "CountryCode"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/objectset_source/object-set-2/Location.csv b/objectset_source/object-set-2/Location.csv
new file mode 100644
index 0000000..310a05e
--- /dev/null
+++ b/objectset_source/object-set-2/Location.csv
@@ -0,0 +1,2 @@
+ParentLocation.Name,Extension,Flat,Floor,Name,DuplicateCheck__c,IsInventoryLocation,IsMobile,LocationType
+"Plantsoen de Pas 12, 6601 BK WIJCHEN, NL",test,,,--,false,false,false,Site
\ No newline at end of file
diff --git a/prepared_steps/1/Address.csv b/prepared_steps/1/Address.csv
new file mode 100644
index 0000000..c67b821
--- /dev/null
+++ b/prepared_steps/1/Address.csv
@@ -0,0 +1,2 @@
+Parent.Name,City,Country,PostalCode,Street,Latitude,Longitude,CountryCode
+"Plantsoen de Pas 12, 6601 BK WIJCHEN, NL",WIJCHEN,Netherlands,6601 BK,Plantsoen de Pas 12,51.81388993,5.72578937,NL
\ No newline at end of file
diff --git a/prepared_steps/1/Location.csv b/prepared_steps/1/Location.csv
new file mode 100644
index 0000000..2b9fbb7
--- /dev/null
+++ b/prepared_steps/1/Location.csv
@@ -0,0 +1,2 @@
+Name,DuplicateCheck__c,IsInventoryLocation,IsMobile,LocationType
+"Plantsoen de Pas 12, 6601 BK WIJCHEN, NL",false,false,false,Site
\ No newline at end of file
diff --git a/prepared_steps/1/export.json b/prepared_steps/1/export.json
new file mode 100644
index 0000000..e94bfee
--- /dev/null
+++ b/prepared_steps/1/export.json
@@ -0,0 +1,15 @@
+{
+    "allOrNone": true,
+    "useSeparatedCSVFiles": true,
+    "excludeIdsFromCSVFiles": true,
+    "objects": [
+        {
+            "query": "SELECT Name,DuplicateCheck__c,IsInventoryLocation,IsMobile,LocationType,VisitorAddressId FROM Location",
+            "operation": "Insert",
+            "externalId": "Name"
+        },{
+            "query": "SELECT City, Country, PostalCode, Street, Latitude, Longitude, CountryCode, ParentId$Location FROM Address",
+            "operation": "Insert"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/source/object-set-2/Location_source.csv b/source/object-set-2/Location_source.csv
deleted file mode 100644
index 7c5fcf6..0000000
--- a/source/object-set-2/Location_source.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-address_identifier,Name,DuplicateCheck__c,IsInventoryLocation,IsMobile,LocationType
-WIJCHENNetherlands6601 BKPlantsoen de Pas12,"Plantsoen de Pas 12, 6601 BK WIJCHEN, NL",false,false,false,Site
diff --git a/source/object-set-3/Location_source.csv b/source/object-set-3/Location_source.csv
deleted file mode 100644
index 4809ee6..0000000
--- a/source/object-set-3/Location_source.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-address_identifier,Extension,Flat,Floor,Name,DuplicateCheck__c,IsInventoryLocation,IsMobile,LocationType
-WIJCHENNetherlands6601 BKPlantsoen de Pas12,,,,--,false,false,false,Site