diff --git a/lib/cdist/__init__.py b/cdist/__init__.py
similarity index 100%
rename from lib/cdist/__init__.py
rename to cdist/__init__.py
diff --git a/lib/cdist/banner.py b/cdist/banner.py
similarity index 100%
rename from lib/cdist/banner.py
rename to cdist/banner.py
diff --git a/lib/cdist/config.py b/cdist/config.py
similarity index 100%
rename from lib/cdist/config.py
rename to cdist/config.py
diff --git a/lib/cdist/config_install.py b/cdist/config_install.py
similarity index 100%
rename from lib/cdist/config_install.py
rename to cdist/config_install.py
diff --git a/lib/cdist/context.py b/cdist/context.py
similarity index 100%
rename from lib/cdist/context.py
rename to cdist/context.py
diff --git a/lib/cdist/core/__init__.py b/cdist/core/__init__.py
similarity index 100%
rename from lib/cdist/core/__init__.py
rename to cdist/core/__init__.py
diff --git a/lib/cdist/core/cdist_object.py b/cdist/core/cdist_object.py
similarity index 100%
rename from lib/cdist/core/cdist_object.py
rename to cdist/core/cdist_object.py
diff --git a/lib/cdist/core/cdist_type.py b/cdist/core/cdist_type.py
similarity index 100%
rename from lib/cdist/core/cdist_type.py
rename to cdist/core/cdist_type.py
diff --git a/lib/cdist/core/code.py b/cdist/core/code.py
similarity index 100%
rename from lib/cdist/core/code.py
rename to cdist/core/code.py
diff --git a/lib/cdist/core/explorer.py b/cdist/core/explorer.py
similarity index 100%
rename from lib/cdist/core/explorer.py
rename to cdist/core/explorer.py
diff --git a/lib/cdist/core/manifest.py b/cdist/core/manifest.py
similarity index 100%
rename from lib/cdist/core/manifest.py
rename to cdist/core/manifest.py
diff --git a/lib/cdist/emulator.py b/cdist/emulator.py
similarity index 100%
rename from lib/cdist/emulator.py
rename to cdist/emulator.py
diff --git a/lib/cdist/exec/__init__.py b/cdist/exec/__init__.py
similarity index 100%
rename from lib/cdist/exec/__init__.py
rename to cdist/exec/__init__.py
diff --git a/lib/cdist/exec/local.py b/cdist/exec/local.py
similarity index 100%
rename from lib/cdist/exec/local.py
rename to cdist/exec/local.py
diff --git a/lib/cdist/exec/remote.py b/cdist/exec/remote.py
similarity index 100%
rename from lib/cdist/exec/remote.py
rename to cdist/exec/remote.py
diff --git a/lib/cdist/install.py b/cdist/install.py
similarity index 100%
rename from lib/cdist/install.py
rename to cdist/install.py
diff --git a/lib/cdist/resolver.py b/cdist/resolver.py
similarity index 100%
rename from lib/cdist/resolver.py
rename to cdist/resolver.py
diff --git a/lib/cdist/test/__init__.py b/cdist/test/__init__.py
similarity index 100%
rename from lib/cdist/test/__init__.py
rename to cdist/test/__init__.py
diff --git a/lib/cdist/test/__main__.py b/cdist/test/__main__.py
similarity index 100%
rename from lib/cdist/test/__main__.py
rename to cdist/test/__main__.py
diff --git a/lib/cdist/test/autorequire/__init__.py b/cdist/test/autorequire/__init__.py
similarity index 100%
rename from lib/cdist/test/autorequire/__init__.py
rename to cdist/test/autorequire/__init__.py
diff --git a/lib/cdist/test/autorequire/fixtures/conf/explorer/.keep b/cdist/test/autorequire/fixtures/conf/explorer/.keep
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/explorer/.keep
rename to cdist/test/autorequire/fixtures/conf/explorer/.keep
diff --git a/lib/cdist/test/autorequire/fixtures/conf/manifest/circular_dependency b/cdist/test/autorequire/fixtures/conf/manifest/circular_dependency
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/manifest/circular_dependency
rename to cdist/test/autorequire/fixtures/conf/manifest/circular_dependency
diff --git a/lib/cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies b/cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies
rename to cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep b/cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep
rename to cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__directory/.keep b/cdist/test/autorequire/fixtures/conf/type/__directory/.keep
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__directory/.keep
rename to cdist/test/autorequire/fixtures/conf/type/__directory/.keep
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest b/cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest
rename to cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__package/manifest b/cdist/test/autorequire/fixtures/conf/type/__package/manifest
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__package/manifest
rename to cdist/test/autorequire/fixtures/conf/type/__package/manifest
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__package_special/.keep b/cdist/test/autorequire/fixtures/conf/type/__package_special/.keep
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__package_special/.keep
rename to cdist/test/autorequire/fixtures/conf/type/__package_special/.keep
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest b/cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest
rename to cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__top/manifest b/cdist/test/autorequire/fixtures/conf/type/__top/manifest
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__top/manifest
rename to cdist/test/autorequire/fixtures/conf/type/__top/manifest
diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__user/.keep b/cdist/test/autorequire/fixtures/conf/type/__user/.keep
similarity index 100%
rename from lib/cdist/test/autorequire/fixtures/conf/type/__user/.keep
rename to cdist/test/autorequire/fixtures/conf/type/__user/.keep
diff --git a/lib/cdist/test/banner/__init__.py b/cdist/test/banner/__init__.py
similarity index 100%
rename from lib/cdist/test/banner/__init__.py
rename to cdist/test/banner/__init__.py
diff --git a/lib/cdist/test/code/__init__.py b/cdist/test/code/__init__.py
similarity index 100%
rename from lib/cdist/test/code/__init__.py
rename to cdist/test/code/__init__.py
diff --git a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local b/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local
similarity index 100%
rename from lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local
rename to cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local
diff --git a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote b/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote
similarity index 100%
rename from lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote
rename to cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote
diff --git a/lib/cdist/test/emulator/__init__.py b/cdist/test/emulator/__init__.py
similarity index 100%
rename from lib/cdist/test/emulator/__init__.py
rename to cdist/test/emulator/__init__.py
diff --git a/lib/cdist/test/emulator/fixtures/conf/explorer/.keep b/cdist/test/emulator/fixtures/conf/explorer/.keep
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/explorer/.keep
rename to cdist/test/emulator/fixtures/conf/explorer/.keep
diff --git a/lib/cdist/test/emulator/fixtures/conf/manifest/init b/cdist/test/emulator/fixtures/conf/manifest/init
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/manifest/init
rename to cdist/test/emulator/fixtures/conf/manifest/init
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean b/cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean
rename to cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional
rename to cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required b/cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required
rename to cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required b/cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required
rename to cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__file b/cdist/test/emulator/fixtures/conf/type/__file
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__file
rename to cdist/test/emulator/fixtures/conf/type/__file
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest b/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest
rename to cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required b/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required
rename to cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__moon/manifest b/cdist/test/emulator/fixtures/conf/type/__moon/manifest
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__moon/manifest
rename to cdist/test/emulator/fixtures/conf/type/__moon/manifest
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional
rename to cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/required b/cdist/test/emulator/fixtures/conf/type/__moon/parameter/required
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/required
rename to cdist/test/emulator/fixtures/conf/type/__moon/parameter/required
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__planet/manifest b/cdist/test/emulator/fixtures/conf/type/__planet/manifest
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__planet/manifest
rename to cdist/test/emulator/fixtures/conf/type/__planet/manifest
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional
rename to cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__saturn/manifest b/cdist/test/emulator/fixtures/conf/type/__saturn/manifest
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__saturn/manifest
rename to cdist/test/emulator/fixtures/conf/type/__saturn/manifest
diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__saturn/singleton b/cdist/test/emulator/fixtures/conf/type/__saturn/singleton
similarity index 100%
rename from lib/cdist/test/emulator/fixtures/conf/type/__saturn/singleton
rename to cdist/test/emulator/fixtures/conf/type/__saturn/singleton
diff --git a/lib/cdist/test/exec/__init__.py b/cdist/test/exec/__init__.py
similarity index 100%
rename from lib/cdist/test/exec/__init__.py
rename to cdist/test/exec/__init__.py
diff --git a/lib/cdist/test/exec/local.py b/cdist/test/exec/local.py
similarity index 100%
rename from lib/cdist/test/exec/local.py
rename to cdist/test/exec/local.py
diff --git a/lib/cdist/test/exec/remote.py b/cdist/test/exec/remote.py
similarity index 100%
rename from lib/cdist/test/exec/remote.py
rename to cdist/test/exec/remote.py
diff --git a/lib/cdist/test/explorer/__init__.py b/cdist/test/explorer/__init__.py
similarity index 100%
rename from lib/cdist/test/explorer/__init__.py
rename to cdist/test/explorer/__init__.py
diff --git a/lib/cdist/test/explorer/fixtures/conf/explorer/foobar b/cdist/test/explorer/fixtures/conf/explorer/foobar
similarity index 100%
rename from lib/cdist/test/explorer/fixtures/conf/explorer/foobar
rename to cdist/test/explorer/fixtures/conf/explorer/foobar
diff --git a/lib/cdist/test/explorer/fixtures/conf/explorer/global b/cdist/test/explorer/fixtures/conf/explorer/global
similarity index 100%
rename from lib/cdist/test/explorer/fixtures/conf/explorer/global
rename to cdist/test/explorer/fixtures/conf/explorer/global
diff --git a/lib/cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world b/cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world
similarity index 100%
rename from lib/cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world
rename to cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world
diff --git a/lib/cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter b/cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter
similarity index 100%
rename from lib/cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter
rename to cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter
diff --git a/lib/cdist/test/manifest/__init__.py b/cdist/test/manifest/__init__.py
similarity index 100%
rename from lib/cdist/test/manifest/__init__.py
rename to cdist/test/manifest/__init__.py
diff --git a/lib/cdist/test/manifest/fixtures/conf/manifest/dump_environment b/cdist/test/manifest/fixtures/conf/manifest/dump_environment
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/manifest/dump_environment
rename to cdist/test/manifest/fixtures/conf/manifest/dump_environment
diff --git a/lib/cdist/test/manifest/fixtures/conf/manifest/init b/cdist/test/manifest/fixtures/conf/manifest/init
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/manifest/init
rename to cdist/test/manifest/fixtures/conf/manifest/init
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest b/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest
rename to cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/.keep b/cdist/test/manifest/fixtures/conf/type/__moon/.keep
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/.keep
rename to cdist/test/manifest/fixtures/conf/type/__moon/.keep
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/manifest b/cdist/test/manifest/fixtures/conf/type/__moon/manifest
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/manifest
rename to cdist/test/manifest/fixtures/conf/type/__moon/manifest
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional b/cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional
rename to cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/required b/cdist/test/manifest/fixtures/conf/type/__moon/parameter/required
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/required
rename to cdist/test/manifest/fixtures/conf/type/__moon/parameter/required
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__planet/.keep b/cdist/test/manifest/fixtures/conf/type/__planet/.keep
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__planet/.keep
rename to cdist/test/manifest/fixtures/conf/type/__planet/.keep
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__planet/manifest b/cdist/test/manifest/fixtures/conf/type/__planet/manifest
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__planet/manifest
rename to cdist/test/manifest/fixtures/conf/type/__planet/manifest
diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional b/cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional
similarity index 100%
rename from lib/cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional
rename to cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional
diff --git a/lib/cdist/test/object/__init__.py b/cdist/test/object/__init__.py
similarity index 100%
rename from lib/cdist/test/object/__init__.py
rename to cdist/test/object/__init__.py
diff --git a/lib/cdist/test/object/fixtures/object/__first/.keep b/cdist/test/object/fixtures/object/__first/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__first/.keep
rename to cdist/test/object/fixtures/object/__first/.keep
diff --git a/lib/cdist/test/object/fixtures/object/__first/man/.cdist/.keep b/cdist/test/object/fixtures/object/__first/man/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__first/man/.cdist/.keep
rename to cdist/test/object/fixtures/object/__first/man/.cdist/.keep
diff --git a/lib/cdist/test/object/fixtures/object/__second/.keep b/cdist/test/object/fixtures/object/__second/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__second/.keep
rename to cdist/test/object/fixtures/object/__second/.keep
diff --git a/lib/cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep b/cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep
rename to cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep
diff --git a/lib/cdist/test/object/fixtures/object/__third/.keep b/cdist/test/object/fixtures/object/__third/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__third/.keep
rename to cdist/test/object/fixtures/object/__third/.keep
diff --git a/lib/cdist/test/object/fixtures/object/__third/moon/.cdist/.keep b/cdist/test/object/fixtures/object/__third/moon/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__third/moon/.cdist/.keep
rename to cdist/test/object/fixtures/object/__third/moon/.cdist/.keep
diff --git a/lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name b/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name
rename to cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name
diff --git a/lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet b/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet
similarity index 100%
rename from lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet
rename to cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet
diff --git a/lib/cdist/test/object/fixtures/type/__first/.keep b/cdist/test/object/fixtures/type/__first/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/type/__first/.keep
rename to cdist/test/object/fixtures/type/__first/.keep
diff --git a/lib/cdist/test/object/fixtures/type/__second/.keep b/cdist/test/object/fixtures/type/__second/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/type/__second/.keep
rename to cdist/test/object/fixtures/type/__second/.keep
diff --git a/lib/cdist/test/object/fixtures/type/__third/.keep b/cdist/test/object/fixtures/type/__third/.keep
similarity index 100%
rename from lib/cdist/test/object/fixtures/type/__third/.keep
rename to cdist/test/object/fixtures/type/__third/.keep
diff --git a/lib/cdist/test/resolver/__init__.py b/cdist/test/resolver/__init__.py
similarity index 100%
rename from lib/cdist/test/resolver/__init__.py
rename to cdist/test/resolver/__init__.py
diff --git a/lib/cdist/test/resolver/fixtures/object/__first/.keep b/cdist/test/resolver/fixtures/object/__first/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__first/.keep
rename to cdist/test/resolver/fixtures/object/__first/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__second/.keep b/cdist/test/resolver/fixtures/object/__second/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__second/.keep
rename to cdist/test/resolver/fixtures/object/__second/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep b/cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep b/cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__third/.keep b/cdist/test/resolver/fixtures/object/__third/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__third/.keep
rename to cdist/test/resolver/fixtures/object/__third/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep b/cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep
rename to cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep
diff --git a/lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name b/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name
rename to cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name
diff --git a/lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet b/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet
rename to cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet
diff --git a/lib/cdist/test/resolver/fixtures/type/__first/.keep b/cdist/test/resolver/fixtures/type/__first/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/type/__first/.keep
rename to cdist/test/resolver/fixtures/type/__first/.keep
diff --git a/lib/cdist/test/resolver/fixtures/type/__second/.keep b/cdist/test/resolver/fixtures/type/__second/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/type/__second/.keep
rename to cdist/test/resolver/fixtures/type/__second/.keep
diff --git a/lib/cdist/test/resolver/fixtures/type/__third/.keep b/cdist/test/resolver/fixtures/type/__third/.keep
similarity index 100%
rename from lib/cdist/test/resolver/fixtures/type/__third/.keep
rename to cdist/test/resolver/fixtures/type/__third/.keep
diff --git a/lib/cdist/test/type/__init__.py b/cdist/test/type/__init__.py
similarity index 100%
rename from lib/cdist/test/type/__init__.py
rename to cdist/test/type/__init__.py
diff --git a/lib/cdist/test/type/fixtures/__install/install b/cdist/test/type/fixtures/__install/install
similarity index 100%
rename from lib/cdist/test/type/fixtures/__install/install
rename to cdist/test/type/fixtures/__install/install
diff --git a/lib/cdist/test/type/fixtures/__name_path/.keep b/cdist/test/type/fixtures/__name_path/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__name_path/.keep
rename to cdist/test/type/fixtures/__name_path/.keep
diff --git a/lib/cdist/test/type/fixtures/__not_install/.keep b/cdist/test/type/fixtures/__not_install/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__not_install/.keep
rename to cdist/test/type/fixtures/__not_install/.keep
diff --git a/lib/cdist/test/type/fixtures/__not_singleton/.keep b/cdist/test/type/fixtures/__not_singleton/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__not_singleton/.keep
rename to cdist/test/type/fixtures/__not_singleton/.keep
diff --git a/lib/cdist/test/type/fixtures/__singleton/singleton b/cdist/test/type/fixtures/__singleton/singleton
similarity index 100%
rename from lib/cdist/test/type/fixtures/__singleton/singleton
rename to cdist/test/type/fixtures/__singleton/singleton
diff --git a/lib/cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean b/cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean
similarity index 100%
rename from lib/cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean
rename to cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean
diff --git a/lib/cdist/test/type/fixtures/__with_explorers/explorer/whatever b/cdist/test/type/fixtures/__with_explorers/explorer/whatever
similarity index 100%
rename from lib/cdist/test/type/fixtures/__with_explorers/explorer/whatever
rename to cdist/test/type/fixtures/__with_explorers/explorer/whatever
diff --git a/lib/cdist/test/type/fixtures/__with_optional_parameters/parameter/optional b/cdist/test/type/fixtures/__with_optional_parameters/parameter/optional
similarity index 100%
rename from lib/cdist/test/type/fixtures/__with_optional_parameters/parameter/optional
rename to cdist/test/type/fixtures/__with_optional_parameters/parameter/optional
diff --git a/lib/cdist/test/type/fixtures/__with_required_parameters/parameter/required b/cdist/test/type/fixtures/__with_required_parameters/parameter/required
similarity index 100%
rename from lib/cdist/test/type/fixtures/__with_required_parameters/parameter/required
rename to cdist/test/type/fixtures/__with_required_parameters/parameter/required
diff --git a/lib/cdist/test/type/fixtures/__without_boolean_parameters/.keep b/cdist/test/type/fixtures/__without_boolean_parameters/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__without_boolean_parameters/.keep
rename to cdist/test/type/fixtures/__without_boolean_parameters/.keep
diff --git a/lib/cdist/test/type/fixtures/__without_explorers/.keep b/cdist/test/type/fixtures/__without_explorers/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__without_explorers/.keep
rename to cdist/test/type/fixtures/__without_explorers/.keep
diff --git a/lib/cdist/test/type/fixtures/__without_optional_parameters/.keep b/cdist/test/type/fixtures/__without_optional_parameters/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__without_optional_parameters/.keep
rename to cdist/test/type/fixtures/__without_optional_parameters/.keep
diff --git a/lib/cdist/test/type/fixtures/__without_required_parameters/.keep b/cdist/test/type/fixtures/__without_required_parameters/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/__without_required_parameters/.keep
rename to cdist/test/type/fixtures/__without_required_parameters/.keep
diff --git a/lib/cdist/test/type/fixtures/list_types/__first/.keep b/cdist/test/type/fixtures/list_types/__first/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/list_types/__first/.keep
rename to cdist/test/type/fixtures/list_types/__first/.keep
diff --git a/lib/cdist/test/type/fixtures/list_types/__second/.keep b/cdist/test/type/fixtures/list_types/__second/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/list_types/__second/.keep
rename to cdist/test/type/fixtures/list_types/__second/.keep
diff --git a/lib/cdist/test/type/fixtures/list_types/__third/.keep b/cdist/test/type/fixtures/list_types/__third/.keep
similarity index 100%
rename from lib/cdist/test/type/fixtures/list_types/__third/.keep
rename to cdist/test/type/fixtures/list_types/__third/.keep
diff --git a/lib/cdist/test/util/__init__.py b/cdist/test/util/__init__.py
similarity index 100%
rename from lib/cdist/test/util/__init__.py
rename to cdist/test/util/__init__.py
diff --git a/lib/cdist/test/util/fsproperty.py b/cdist/test/util/fsproperty.py
similarity index 100%
rename from lib/cdist/test/util/fsproperty.py
rename to cdist/test/util/fsproperty.py
diff --git a/lib/cdist/util/__init__.py b/cdist/util/__init__.py
similarity index 100%
rename from lib/cdist/util/__init__.py
rename to cdist/util/__init__.py
diff --git a/lib/cdist/util/fsproperty.py b/cdist/util/fsproperty.py
similarity index 100%
rename from lib/cdist/util/fsproperty.py
rename to cdist/util/fsproperty.py