diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-affiliation.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-affiliation.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-affiliation.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-affiliation.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-course.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-course.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-course.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-course.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-department.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-department.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-department.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-department.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-external-person.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-external-person.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-external-person.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-external-person.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-generic-grouper-group.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-generic-grouper-group.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-generic-grouper-group.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-generic-grouper-group.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-mailing-list.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-mailing-list.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-mailing-list.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-mailing-list.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-midpoint-group.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-midpoint-group.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-midpoint-group.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-midpoint-group.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-sis-person.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-sis-person.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/archetype-sis-person.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/300-archetype-sis-person.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/990-test-all-resources.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/900-test-all-resources.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/990-test-all-resources.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/900-test-all-resources.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/991-recompute-grouper.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/910-recompute-grouper-objects.xml
similarity index 74%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/991-recompute-grouper.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/910-recompute-grouper-objects.xml
index 4be7285..83aa382 100644
--- a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/991-recompute-grouper.xml
+++ b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/bulkActions/910-recompute-grouper-objects.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- (c) 2019 Evolveum, All rights reserved -->
 
+<!-- Actually this is not really needed, as the objects were imported in non-raw mode
+     (and presumably in the correct order). But let's keep this here. -->
+
 <s:search xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3"
           xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
           xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <s:type>ObjectType</s:type>
         <s:searchFilter>
             <q:inOid>
-                <q:value>d48ec05b-fffd-4262-acd3-d9ff63365b62</q:value>
-                <q:value>e897468f-20bd-419c-8fc5-1fe60e2600de</q:value>
+                <q:value>d48ec05b-fffd-4262-acd3-d9ff63365b62</q:value>  <!-- org-grouper-sysadmin -->
+                <q:value>e897468f-20bd-419c-8fc5-1fe60e2600de</q:value>  <!-- user-banderson -->
             </q:inOid>
         </s:searchFilter>
     <s:action>
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/functionLibraries/function-library-grouper.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/functionLibraries/100-function-library-grouper.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/functionLibraries/function-library-grouper.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/functionLibraries/100-function-library-grouper.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/objectTemplates/template-user.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/objectTemplates/100-template-user.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/objectTemplates/template-user.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/objectTemplates/100-template-user.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt
new file mode 100644
index 0000000..78bfa93
--- /dev/null
+++ b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt
@@ -0,0 +1,21 @@
+Notes on objects ordering
+=========================
+
+Objects are ordered to be imported in waves. Objects in each wave can depend only on objects in preceding waves.
+(By depending we mean that the other object should exist in repo in order to assure warning-less import. Usually,
+assigned/induced objects should exist. Objects that are referenced e.g. in groovy code are not required at the
+import time.)
+
+Waves are:
+- 000: system configuration
+- 100: resources (do not depend on anything)
+       root orgs (do not depend on anything)
+       user template (inactive until users are imported)
+       grouper function library (inactive until async updates come)
+- 200: metaroles and roles (contain constructions i.e. references to resources)
+- 300: archetypes (induce resources, root orgs, metaroles)
+- 400: specific orgs i.e. org-grouper-sysadmin (has an archetype)
+- 600: specific users i.e. user-banderson (is in specific orgs)
+- 9xx: bulk actions (testing all resource, recomputing grouper objects)
+       importing scavenger task
+
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-affiliations.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-affiliations.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-affiliations.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-affiliations.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-courses.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-courses.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-courses.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-courses.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-departments.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-departments.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-departments.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-departments.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-generic-groups.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-generic-groups.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-generic-groups.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-generic-groups.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-mailing-lists.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-mailing-lists.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-mailing-lists.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-mailing-lists.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-midpoint-groups.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-midpoint-groups.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-midpoint-groups.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/100-org-midpoint-groups.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-grouper-sysadmin.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/400-org-grouper-sysadmin.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/org-grouper-sysadmin.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/orgs/400-org-grouper-sysadmin.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/resource-grouper.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/resource-grouper.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/ldap-main.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/ldap-main.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/scriptedsql-sis-persons.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/scriptedsql-sis-persons.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/target-cs-portal.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-target-cs-portal.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/target-cs-portal.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-target-cs-portal.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/target-faculty-portal.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-target-faculty-portal.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/target-faculty-portal.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-target-faculty-portal.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/target-mailing-lists.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-target-mailing-lists.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/target-mailing-lists.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-target-mailing-lists.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/metarole-grouper-provided-group.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/metarole-grouper-provided-group.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/metarole-ldap-group.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-ldap-group.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/metarole-ldap-group.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-ldap-group.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/role-ldap-basic.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-role-ldap-basic.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/role-ldap-basic.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-role-ldap-basic.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/SystemConfiguration.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/000-system-configuration.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/SystemConfiguration.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/000-system-configuration.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/users/user-banderson.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/users/600-user-banderson.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/users/user-banderson.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/users/600-user-banderson.xml