diff --git a/sigil/bld-ivy/.classpath b/sigil/ivy/resolver/.classpath
similarity index 100%
rename from sigil/bld-ivy/.classpath
rename to sigil/ivy/resolver/.classpath
diff --git a/sigil/bld-ivy/.project b/sigil/ivy/resolver/.project
similarity index 100%
rename from sigil/bld-ivy/.project
rename to sigil/ivy/resolver/.project
diff --git a/sigil/bld-ivy/build.xml b/sigil/ivy/resolver/build.xml
similarity index 100%
rename from sigil/bld-ivy/build.xml
rename to sigil/ivy/resolver/build.xml
diff --git a/sigil/bld-ivy/example/dependence/README b/sigil/ivy/resolver/example/dependence/README
similarity index 100%
rename from sigil/bld-ivy/example/dependence/README
rename to sigil/ivy/resolver/example/dependence/README
diff --git a/sigil/bld-ivy/example/dependence/build.xml b/sigil/ivy/resolver/example/dependence/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/dependence/build.xml
rename to sigil/ivy/resolver/example/dependence/build.xml
diff --git a/sigil/bld-ivy/example/dependence/dependee/build.xml b/sigil/ivy/resolver/example/dependence/dependee/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/dependence/dependee/build.xml
rename to sigil/ivy/resolver/example/dependence/dependee/build.xml
diff --git a/sigil/bld-ivy/example/dependence/dependee/ivy.xml b/sigil/ivy/resolver/example/dependence/dependee/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/dependence/dependee/ivy.xml
rename to sigil/ivy/resolver/example/dependence/dependee/ivy.xml
diff --git a/sigil/bld-ivy/example/dependence/dependee/sigil.properties b/sigil/ivy/resolver/example/dependence/dependee/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/dependence/dependee/sigil.properties
rename to sigil/ivy/resolver/example/dependence/dependee/sigil.properties
diff --git a/sigil/bld-ivy/example/dependence/dependee/src/standalone/Main.java b/sigil/ivy/resolver/example/dependence/dependee/src/standalone/Main.java
similarity index 100%
rename from sigil/bld-ivy/example/dependence/dependee/src/standalone/Main.java
rename to sigil/ivy/resolver/example/dependence/dependee/src/standalone/Main.java
diff --git a/sigil/bld-ivy/example/dependence/depender/build.xml b/sigil/ivy/resolver/example/dependence/depender/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/dependence/depender/build.xml
rename to sigil/ivy/resolver/example/dependence/depender/build.xml
diff --git a/sigil/bld-ivy/example/dependence/depender/ivy.xml b/sigil/ivy/resolver/example/dependence/depender/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/dependence/depender/ivy.xml
rename to sigil/ivy/resolver/example/dependence/depender/ivy.xml
diff --git a/sigil/bld-ivy/example/dependence/depender/sigil.properties b/sigil/ivy/resolver/example/dependence/depender/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/dependence/depender/sigil.properties
rename to sigil/ivy/resolver/example/dependence/depender/sigil.properties
diff --git a/sigil/bld-ivy/example/dependence/depender/src/depending/Main.java b/sigil/ivy/resolver/example/dependence/depender/src/depending/Main.java
similarity index 100%
rename from sigil/bld-ivy/example/dependence/depender/src/depending/Main.java
rename to sigil/ivy/resolver/example/dependence/depender/src/depending/Main.java
diff --git a/sigil/bld-ivy/example/dependence/settings/ivysettings.properties b/sigil/ivy/resolver/example/dependence/settings/ivysettings.properties
similarity index 100%
rename from sigil/bld-ivy/example/dependence/settings/ivysettings.properties
rename to sigil/ivy/resolver/example/dependence/settings/ivysettings.properties
diff --git a/sigil/bld-ivy/example/dependence/settings/ivysettings.xml b/sigil/ivy/resolver/example/dependence/settings/ivysettings.xml
similarity index 100%
rename from sigil/bld-ivy/example/dependence/settings/ivysettings.xml
rename to sigil/ivy/resolver/example/dependence/settings/ivysettings.xml
diff --git a/sigil/bld-ivy/example/dependence/settings/sigil-repos.properties b/sigil/ivy/resolver/example/dependence/settings/sigil-repos.properties
similarity index 100%
rename from sigil/bld-ivy/example/dependence/settings/sigil-repos.properties
rename to sigil/ivy/resolver/example/dependence/settings/sigil-repos.properties
diff --git a/sigil/bld-ivy/example/felix-log/README b/sigil/ivy/resolver/example/felix-log/README
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/README
rename to sigil/ivy/resolver/example/felix-log/README
diff --git a/sigil/bld-ivy/example/felix-log/bldcommon/build.properties b/sigil/ivy/resolver/example/felix-log/bldcommon/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/bldcommon/build.properties
rename to sigil/ivy/resolver/example/felix-log/bldcommon/build.properties
diff --git a/sigil/bld-ivy/example/felix-log/bldcommon/common.xml b/sigil/ivy/resolver/example/felix-log/bldcommon/common.xml
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/bldcommon/common.xml
rename to sigil/ivy/resolver/example/felix-log/bldcommon/common.xml
diff --git a/sigil/bld-ivy/example/felix-log/bldcommon/ivysettings.xml b/sigil/ivy/resolver/example/felix-log/bldcommon/ivysettings.xml
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/bldcommon/ivysettings.xml
rename to sigil/ivy/resolver/example/felix-log/bldcommon/ivysettings.xml
diff --git a/sigil/bld-ivy/example/felix-log/bldcommon/sigil-repos.properties b/sigil/ivy/resolver/example/felix-log/bldcommon/sigil-repos.properties
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/bldcommon/sigil-repos.properties
rename to sigil/ivy/resolver/example/felix-log/bldcommon/sigil-repos.properties
diff --git a/sigil/bld-ivy/example/felix-log/log/build.xml b/sigil/ivy/resolver/example/felix-log/log/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/log/build.xml
rename to sigil/ivy/resolver/example/felix-log/log/build.xml
diff --git a/sigil/bld-ivy/example/felix-log/log/ivy.xml b/sigil/ivy/resolver/example/felix-log/log/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/log/ivy.xml
rename to sigil/ivy/resolver/example/felix-log/log/ivy.xml
diff --git a/sigil/bld-ivy/example/felix-log/log/sigil.properties b/sigil/ivy/resolver/example/felix-log/log/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/felix-log/log/sigil.properties
rename to sigil/ivy/resolver/example/felix-log/log/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/README b/sigil/ivy/resolver/example/multi-project/README
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/README
rename to sigil/ivy/resolver/example/multi-project/README
diff --git a/sigil/bld-ivy/example/multi-project/build.xml b/sigil/ivy/resolver/example/multi-project/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/build.xml
rename to sigil/ivy/resolver/example/multi-project/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/common/build.properties b/sigil/ivy/resolver/example/multi-project/common/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/common/build.properties
rename to sigil/ivy/resolver/example/multi-project/common/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/common/common.xml b/sigil/ivy/resolver/example/multi-project/common/common.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/common/common.xml
rename to sigil/ivy/resolver/example/multi-project/common/common.xml
diff --git a/sigil/bld-ivy/example/multi-project/common/ivysettings.xml b/sigil/ivy/resolver/example/multi-project/common/ivysettings.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/common/ivysettings.xml
rename to sigil/ivy/resolver/example/multi-project/common/ivysettings.xml
diff --git a/sigil/bld-ivy/example/multi-project/common/sigil-repos.properties b/sigil/ivy/resolver/example/multi-project/common/sigil-repos.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/common/sigil-repos.properties
rename to sigil/ivy/resolver/example/multi-project/common/sigil-repos.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/console/build.properties b/sigil/ivy/resolver/example/multi-project/projects/console/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/console/build.properties
rename to sigil/ivy/resolver/example/multi-project/projects/console/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/console/build.xml b/sigil/ivy/resolver/example/multi-project/projects/console/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/console/build.xml
rename to sigil/ivy/resolver/example/multi-project/projects/console/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/console/ivy.xml b/sigil/ivy/resolver/example/multi-project/projects/console/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/console/ivy.xml
rename to sigil/ivy/resolver/example/multi-project/projects/console/ivy.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/console/sigil.properties b/sigil/ivy/resolver/example/multi-project/projects/console/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/console/sigil.properties
rename to sigil/ivy/resolver/example/multi-project/projects/console/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/console/src/console/Main.java b/sigil/ivy/resolver/example/multi-project/projects/console/src/console/Main.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/console/src/console/Main.java
rename to sigil/ivy/resolver/example/multi-project/projects/console/src/console/Main.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/find/build.properties b/sigil/ivy/resolver/example/multi-project/projects/find/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/find/build.properties
rename to sigil/ivy/resolver/example/multi-project/projects/find/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/find/build.xml b/sigil/ivy/resolver/example/multi-project/projects/find/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/find/build.xml
rename to sigil/ivy/resolver/example/multi-project/projects/find/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/find/ivy.xml b/sigil/ivy/resolver/example/multi-project/projects/find/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/find/ivy.xml
rename to sigil/ivy/resolver/example/multi-project/projects/find/ivy.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/find/sigil.properties b/sigil/ivy/resolver/example/multi-project/projects/find/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/find/sigil.properties
rename to sigil/ivy/resolver/example/multi-project/projects/find/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/find/src/find/FindFile.java b/sigil/ivy/resolver/example/multi-project/projects/find/src/find/FindFile.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/find/src/find/FindFile.java
rename to sigil/ivy/resolver/example/multi-project/projects/find/src/find/FindFile.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/find/src/find/Main.java b/sigil/ivy/resolver/example/multi-project/projects/find/src/find/Main.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/find/src/find/Main.java
rename to sigil/ivy/resolver/example/multi-project/projects/find/src/find/Main.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/list/build.properties b/sigil/ivy/resolver/example/multi-project/projects/list/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/list/build.properties
rename to sigil/ivy/resolver/example/multi-project/projects/list/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/list/build.xml b/sigil/ivy/resolver/example/multi-project/projects/list/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/list/build.xml
rename to sigil/ivy/resolver/example/multi-project/projects/list/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/list/ivy.xml b/sigil/ivy/resolver/example/multi-project/projects/list/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/list/ivy.xml
rename to sigil/ivy/resolver/example/multi-project/projects/list/ivy.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/list/sigil.properties b/sigil/ivy/resolver/example/multi-project/projects/list/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/list/sigil.properties
rename to sigil/ivy/resolver/example/multi-project/projects/list/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/list/src/list/ListFile.java b/sigil/ivy/resolver/example/multi-project/projects/list/src/list/ListFile.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/list/src/list/ListFile.java
rename to sigil/ivy/resolver/example/multi-project/projects/list/src/list/ListFile.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/list/src/list/Main.java b/sigil/ivy/resolver/example/multi-project/projects/list/src/list/Main.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/list/src/list/Main.java
rename to sigil/ivy/resolver/example/multi-project/projects/list/src/list/Main.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/sigil-defaults.properties b/sigil/ivy/resolver/example/multi-project/projects/sigil-defaults.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sigil-defaults.properties
rename to sigil/ivy/resolver/example/multi-project/projects/sigil-defaults.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/size/build.properties b/sigil/ivy/resolver/example/multi-project/projects/size/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/size/build.properties
rename to sigil/ivy/resolver/example/multi-project/projects/size/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/size/build.xml b/sigil/ivy/resolver/example/multi-project/projects/size/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/size/build.xml
rename to sigil/ivy/resolver/example/multi-project/projects/size/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/size/ivy.xml b/sigil/ivy/resolver/example/multi-project/projects/size/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/size/ivy.xml
rename to sigil/ivy/resolver/example/multi-project/projects/size/ivy.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/size/sigil.properties b/sigil/ivy/resolver/example/multi-project/projects/size/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/size/sigil.properties
rename to sigil/ivy/resolver/example/multi-project/projects/size/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/size/src/size/FileSize.java b/sigil/ivy/resolver/example/multi-project/projects/size/src/size/FileSize.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/size/src/size/FileSize.java
rename to sigil/ivy/resolver/example/multi-project/projects/size/src/size/FileSize.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/sizewhere/build.properties b/sigil/ivy/resolver/example/multi-project/projects/sizewhere/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sizewhere/build.properties
rename to sigil/ivy/resolver/example/multi-project/projects/sizewhere/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/sizewhere/build.xml b/sigil/ivy/resolver/example/multi-project/projects/sizewhere/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sizewhere/build.xml
rename to sigil/ivy/resolver/example/multi-project/projects/sizewhere/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/sizewhere/ivy.xml b/sigil/ivy/resolver/example/multi-project/projects/sizewhere/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sizewhere/ivy.xml
rename to sigil/ivy/resolver/example/multi-project/projects/sizewhere/ivy.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/sizewhere/sigil.properties b/sigil/ivy/resolver/example/multi-project/projects/sizewhere/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sizewhere/sigil.properties
rename to sigil/ivy/resolver/example/multi-project/projects/sizewhere/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/sizewhere/src/sizewhere/Main.java b/sigil/ivy/resolver/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
rename to sigil/ivy/resolver/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java b/sigil/ivy/resolver/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
rename to sigil/ivy/resolver/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
diff --git a/sigil/bld-ivy/example/multi-project/projects/version/build.properties b/sigil/ivy/resolver/example/multi-project/projects/version/build.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/version/build.properties
rename to sigil/ivy/resolver/example/multi-project/projects/version/build.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/version/build.xml b/sigil/ivy/resolver/example/multi-project/projects/version/build.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/version/build.xml
rename to sigil/ivy/resolver/example/multi-project/projects/version/build.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/version/ivy.xml b/sigil/ivy/resolver/example/multi-project/projects/version/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/version/ivy.xml
rename to sigil/ivy/resolver/example/multi-project/projects/version/ivy.xml
diff --git a/sigil/bld-ivy/example/multi-project/projects/version/sigil.properties b/sigil/ivy/resolver/example/multi-project/projects/version/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/version/sigil.properties
rename to sigil/ivy/resolver/example/multi-project/projects/version/sigil.properties
diff --git a/sigil/bld-ivy/example/multi-project/projects/version/src/version/Version.java b/sigil/ivy/resolver/example/multi-project/projects/version/src/version/Version.java
similarity index 100%
rename from sigil/bld-ivy/example/multi-project/projects/version/src/version/Version.java
rename to sigil/ivy/resolver/example/multi-project/projects/version/src/version/Version.java
diff --git a/sigil/bld-ivy/sigil-ivy-plugin.bnd b/sigil/ivy/resolver/sigil-ivy-plugin.bnd
similarity index 100%
rename from sigil/bld-ivy/sigil-ivy-plugin.bnd
rename to sigil/ivy/resolver/sigil-ivy-plugin.bnd
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ant/BundleInfoTask.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleInfoTask.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ant/BundleInfoTask.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleInfoTask.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ant/BundleTask.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ant/BundleTask.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/BldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/BldResolver.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/FindUtil.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/FindUtil.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/FindUtil.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/FindUtil.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/IBldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/IBldResolver.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/Log.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/Log.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/Log.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/Log.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/ProjectRepository.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/ProjectRepository.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/SigilParser.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/SigilParser.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
diff --git a/sigil/bld-ivy/src/org/apache/felix/sigil/ivy/SigilResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
similarity index 100%
rename from sigil/bld-ivy/src/org/apache/felix/sigil/ivy/SigilResolver.java
rename to sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
diff --git a/sigil/bld-ivy/test/config/proj1/sigil.properties b/sigil/ivy/resolver/test/config/proj1/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/config/proj1/sigil.properties
rename to sigil/ivy/resolver/test/config/proj1/sigil.properties
diff --git a/sigil/bld-ivy/test/config/sigil-defaults.properties b/sigil/ivy/resolver/test/config/sigil-defaults.properties
similarity index 100%
rename from sigil/bld-ivy/test/config/sigil-defaults.properties
rename to sigil/ivy/resolver/test/config/sigil-defaults.properties
diff --git a/sigil/bld-ivy/test/dependence/build.xml b/sigil/ivy/resolver/test/dependence/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/dependence/build.xml
rename to sigil/ivy/resolver/test/dependence/build.xml
diff --git a/sigil/bld-ivy/test/dependence/dependee/build.xml b/sigil/ivy/resolver/test/dependence/dependee/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/dependence/dependee/build.xml
rename to sigil/ivy/resolver/test/dependence/dependee/build.xml
diff --git a/sigil/bld-ivy/test/dependence/dependee/ivy.xml b/sigil/ivy/resolver/test/dependence/dependee/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/dependence/dependee/ivy.xml
rename to sigil/ivy/resolver/test/dependence/dependee/ivy.xml
diff --git a/sigil/bld-ivy/test/dependence/dependee/sigil.properties b/sigil/ivy/resolver/test/dependence/dependee/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/dependence/dependee/sigil.properties
rename to sigil/ivy/resolver/test/dependence/dependee/sigil.properties
diff --git a/sigil/bld-ivy/test/dependence/dependee/src/standalone/Main.java b/sigil/ivy/resolver/test/dependence/dependee/src/standalone/Main.java
similarity index 100%
rename from sigil/bld-ivy/test/dependence/dependee/src/standalone/Main.java
rename to sigil/ivy/resolver/test/dependence/dependee/src/standalone/Main.java
diff --git a/sigil/bld-ivy/test/dependence/depender/build.xml b/sigil/ivy/resolver/test/dependence/depender/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/dependence/depender/build.xml
rename to sigil/ivy/resolver/test/dependence/depender/build.xml
diff --git a/sigil/bld-ivy/test/dependence/depender/ivy.xml b/sigil/ivy/resolver/test/dependence/depender/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/dependence/depender/ivy.xml
rename to sigil/ivy/resolver/test/dependence/depender/ivy.xml
diff --git a/sigil/bld-ivy/test/dependence/depender/sigil.properties b/sigil/ivy/resolver/test/dependence/depender/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/dependence/depender/sigil.properties
rename to sigil/ivy/resolver/test/dependence/depender/sigil.properties
diff --git a/sigil/bld-ivy/test/dependence/depender/src/depending/Main.java b/sigil/ivy/resolver/test/dependence/depender/src/depending/Main.java
similarity index 100%
rename from sigil/bld-ivy/test/dependence/depender/src/depending/Main.java
rename to sigil/ivy/resolver/test/dependence/depender/src/depending/Main.java
diff --git a/sigil/bld-ivy/test/dependence/settings/ivysettings.properties b/sigil/ivy/resolver/test/dependence/settings/ivysettings.properties
similarity index 100%
rename from sigil/bld-ivy/test/dependence/settings/ivysettings.properties
rename to sigil/ivy/resolver/test/dependence/settings/ivysettings.properties
diff --git a/sigil/bld-ivy/test/dependence/settings/ivysettings.xml b/sigil/ivy/resolver/test/dependence/settings/ivysettings.xml
similarity index 100%
rename from sigil/bld-ivy/test/dependence/settings/ivysettings.xml
rename to sigil/ivy/resolver/test/dependence/settings/ivysettings.xml
diff --git a/sigil/bld-ivy/test/dependence/settings/sigil-repos.properties b/sigil/ivy/resolver/test/dependence/settings/sigil-repos.properties
similarity index 100%
rename from sigil/bld-ivy/test/dependence/settings/sigil-repos.properties
rename to sigil/ivy/resolver/test/dependence/settings/sigil-repos.properties
diff --git a/sigil/bld-ivy/test/dependence/sigil-defaults.properties b/sigil/ivy/resolver/test/dependence/sigil-defaults.properties
similarity index 100%
rename from sigil/bld-ivy/test/dependence/sigil-defaults.properties
rename to sigil/ivy/resolver/test/dependence/sigil-defaults.properties
diff --git a/sigil/bld-ivy/test/multi-project/build.xml b/sigil/ivy/resolver/test/multi-project/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/build.xml
rename to sigil/ivy/resolver/test/multi-project/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/common/build.properties b/sigil/ivy/resolver/test/multi-project/common/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/common/build.properties
rename to sigil/ivy/resolver/test/multi-project/common/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/common/common.xml b/sigil/ivy/resolver/test/multi-project/common/common.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/common/common.xml
rename to sigil/ivy/resolver/test/multi-project/common/common.xml
diff --git a/sigil/bld-ivy/test/multi-project/common/ivysettings.xml b/sigil/ivy/resolver/test/multi-project/common/ivysettings.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/common/ivysettings.xml
rename to sigil/ivy/resolver/test/multi-project/common/ivysettings.xml
diff --git a/sigil/bld-ivy/test/multi-project/common/sigil-gen.sh b/sigil/ivy/resolver/test/multi-project/common/sigil-gen.sh
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/common/sigil-gen.sh
rename to sigil/ivy/resolver/test/multi-project/common/sigil-gen.sh
diff --git a/sigil/bld-ivy/test/multi-project/common/sigil-repos.properties b/sigil/ivy/resolver/test/multi-project/common/sigil-repos.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/common/sigil-repos.properties
rename to sigil/ivy/resolver/test/multi-project/common/sigil-repos.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/console/build.properties b/sigil/ivy/resolver/test/multi-project/projects/console/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/console/build.properties
rename to sigil/ivy/resolver/test/multi-project/projects/console/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/console/build.xml b/sigil/ivy/resolver/test/multi-project/projects/console/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/console/build.xml
rename to sigil/ivy/resolver/test/multi-project/projects/console/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/console/ivy.xml b/sigil/ivy/resolver/test/multi-project/projects/console/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/console/ivy.xml
rename to sigil/ivy/resolver/test/multi-project/projects/console/ivy.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/console/sigil.properties b/sigil/ivy/resolver/test/multi-project/projects/console/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/console/sigil.properties
rename to sigil/ivy/resolver/test/multi-project/projects/console/sigil.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/console/src/console/Main.java b/sigil/ivy/resolver/test/multi-project/projects/console/src/console/Main.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/console/src/console/Main.java
rename to sigil/ivy/resolver/test/multi-project/projects/console/src/console/Main.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/find/build.properties b/sigil/ivy/resolver/test/multi-project/projects/find/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/find/build.properties
rename to sigil/ivy/resolver/test/multi-project/projects/find/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/find/build.xml b/sigil/ivy/resolver/test/multi-project/projects/find/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/find/build.xml
rename to sigil/ivy/resolver/test/multi-project/projects/find/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/find/ivy.xml b/sigil/ivy/resolver/test/multi-project/projects/find/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/find/ivy.xml
rename to sigil/ivy/resolver/test/multi-project/projects/find/ivy.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/find/sigil.properties b/sigil/ivy/resolver/test/multi-project/projects/find/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/find/sigil.properties
rename to sigil/ivy/resolver/test/multi-project/projects/find/sigil.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/find/src/find/FindFile.java b/sigil/ivy/resolver/test/multi-project/projects/find/src/find/FindFile.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/find/src/find/FindFile.java
rename to sigil/ivy/resolver/test/multi-project/projects/find/src/find/FindFile.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/find/src/find/Main.java b/sigil/ivy/resolver/test/multi-project/projects/find/src/find/Main.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/find/src/find/Main.java
rename to sigil/ivy/resolver/test/multi-project/projects/find/src/find/Main.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/list/build.properties b/sigil/ivy/resolver/test/multi-project/projects/list/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/list/build.properties
rename to sigil/ivy/resolver/test/multi-project/projects/list/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/list/build.xml b/sigil/ivy/resolver/test/multi-project/projects/list/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/list/build.xml
rename to sigil/ivy/resolver/test/multi-project/projects/list/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/list/ivy.xml b/sigil/ivy/resolver/test/multi-project/projects/list/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/list/ivy.xml
rename to sigil/ivy/resolver/test/multi-project/projects/list/ivy.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/list/sigil.properties b/sigil/ivy/resolver/test/multi-project/projects/list/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/list/sigil.properties
rename to sigil/ivy/resolver/test/multi-project/projects/list/sigil.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/list/src/list/ListFile.java b/sigil/ivy/resolver/test/multi-project/projects/list/src/list/ListFile.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/list/src/list/ListFile.java
rename to sigil/ivy/resolver/test/multi-project/projects/list/src/list/ListFile.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/list/src/list/Main.java b/sigil/ivy/resolver/test/multi-project/projects/list/src/list/Main.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/list/src/list/Main.java
rename to sigil/ivy/resolver/test/multi-project/projects/list/src/list/Main.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/sigil-defaults.properties b/sigil/ivy/resolver/test/multi-project/projects/sigil-defaults.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sigil-defaults.properties
rename to sigil/ivy/resolver/test/multi-project/projects/sigil-defaults.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/size/build.properties b/sigil/ivy/resolver/test/multi-project/projects/size/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/size/build.properties
rename to sigil/ivy/resolver/test/multi-project/projects/size/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/size/build.xml b/sigil/ivy/resolver/test/multi-project/projects/size/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/size/build.xml
rename to sigil/ivy/resolver/test/multi-project/projects/size/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/size/ivy.xml b/sigil/ivy/resolver/test/multi-project/projects/size/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/size/ivy.xml
rename to sigil/ivy/resolver/test/multi-project/projects/size/ivy.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/size/sigil.properties b/sigil/ivy/resolver/test/multi-project/projects/size/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/size/sigil.properties
rename to sigil/ivy/resolver/test/multi-project/projects/size/sigil.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/size/src/size/FileSize.java b/sigil/ivy/resolver/test/multi-project/projects/size/src/size/FileSize.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/size/src/size/FileSize.java
rename to sigil/ivy/resolver/test/multi-project/projects/size/src/size/FileSize.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/sizewhere/build.properties b/sigil/ivy/resolver/test/multi-project/projects/sizewhere/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sizewhere/build.properties
rename to sigil/ivy/resolver/test/multi-project/projects/sizewhere/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/sizewhere/build.xml b/sigil/ivy/resolver/test/multi-project/projects/sizewhere/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sizewhere/build.xml
rename to sigil/ivy/resolver/test/multi-project/projects/sizewhere/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/sizewhere/ivy.xml b/sigil/ivy/resolver/test/multi-project/projects/sizewhere/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sizewhere/ivy.xml
rename to sigil/ivy/resolver/test/multi-project/projects/sizewhere/ivy.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/sizewhere/sigil.properties b/sigil/ivy/resolver/test/multi-project/projects/sizewhere/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sizewhere/sigil.properties
rename to sigil/ivy/resolver/test/multi-project/projects/sizewhere/sigil.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/sizewhere/src/sizewhere/Main.java b/sigil/ivy/resolver/test/multi-project/projects/sizewhere/src/sizewhere/Main.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sizewhere/src/sizewhere/Main.java
rename to sigil/ivy/resolver/test/multi-project/projects/sizewhere/src/sizewhere/Main.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java b/sigil/ivy/resolver/test/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
rename to sigil/ivy/resolver/test/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
diff --git a/sigil/bld-ivy/test/multi-project/projects/version/build.properties b/sigil/ivy/resolver/test/multi-project/projects/version/build.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/version/build.properties
rename to sigil/ivy/resolver/test/multi-project/projects/version/build.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/version/build.xml b/sigil/ivy/resolver/test/multi-project/projects/version/build.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/version/build.xml
rename to sigil/ivy/resolver/test/multi-project/projects/version/build.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/version/ivy.xml b/sigil/ivy/resolver/test/multi-project/projects/version/ivy.xml
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/version/ivy.xml
rename to sigil/ivy/resolver/test/multi-project/projects/version/ivy.xml
diff --git a/sigil/bld-ivy/test/multi-project/projects/version/sigil.properties b/sigil/ivy/resolver/test/multi-project/projects/version/sigil.properties
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/version/sigil.properties
rename to sigil/ivy/resolver/test/multi-project/projects/version/sigil.properties
diff --git a/sigil/bld-ivy/test/multi-project/projects/version/src/version/Version.java b/sigil/ivy/resolver/test/multi-project/projects/version/src/version/Version.java
similarity index 100%
rename from sigil/bld-ivy/test/multi-project/projects/version/src/version/Version.java
rename to sigil/ivy/resolver/test/multi-project/projects/version/src/version/Version.java