Move the world out of /zfs/ and seperate out module build tree

diff --git a/zfs/zcmd/zdb/zdb.c b/cmd/zdb/zdb.c
similarity index 100%
rename from zfs/zcmd/zdb/zdb.c
rename to cmd/zdb/zdb.c

diff --git a/zfs/zcmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c
similarity index 100%
rename from zfs/zcmd/zdb/zdb_il.c
rename to cmd/zdb/zdb_il.c

diff --git a/zfs/zcmd/zdump/zdump.c b/cmd/zdump/zdump.c
similarity index 100%
rename from zfs/zcmd/zdump/zdump.c
rename to cmd/zdump/zdump.c

diff --git a/zfs/zcmd/zfs/zfs_iter.c b/cmd/zfs/zfs_iter.c
similarity index 100%
rename from zfs/zcmd/zfs/zfs_iter.c
rename to cmd/zfs/zfs_iter.c

diff --git a/zfs/zcmd/zfs/zfs_iter.h b/cmd/zfs/zfs_iter.h
similarity index 100%
rename from zfs/zcmd/zfs/zfs_iter.h
rename to cmd/zfs/zfs_iter.h

diff --git a/zfs/zcmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
similarity index 100%
rename from zfs/zcmd/zfs/zfs_main.c
rename to cmd/zfs/zfs_main.c

diff --git a/zfs/zcmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h
similarity index 100%
rename from zfs/zcmd/zfs/zfs_util.h
rename to cmd/zfs/zfs_util.h

diff --git a/zfs/zcmd/zinject/translate.c b/cmd/zinject/translate.c
similarity index 100%
rename from zfs/zcmd/zinject/translate.c
rename to cmd/zinject/translate.c

diff --git a/zfs/zcmd/zinject/zinject.c b/cmd/zinject/zinject.c
similarity index 100%
rename from zfs/zcmd/zinject/zinject.c
rename to cmd/zinject/zinject.c

diff --git a/zfs/zcmd/zinject/zinject.h b/cmd/zinject/zinject.h
similarity index 100%
rename from zfs/zcmd/zinject/zinject.h
rename to cmd/zinject/zinject.h

diff --git a/zfs/zcmd/zpool/zpool_iter.c b/cmd/zpool/zpool_iter.c
similarity index 100%
rename from zfs/zcmd/zpool/zpool_iter.c
rename to cmd/zpool/zpool_iter.c

diff --git a/zfs/zcmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
similarity index 100%
rename from zfs/zcmd/zpool/zpool_main.c
rename to cmd/zpool/zpool_main.c

diff --git a/zfs/zcmd/zpool/zpool_util.c b/cmd/zpool/zpool_util.c
similarity index 100%
rename from zfs/zcmd/zpool/zpool_util.c
rename to cmd/zpool/zpool_util.c

diff --git a/zfs/zcmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h
similarity index 100%
rename from zfs/zcmd/zpool/zpool_util.h
rename to cmd/zpool/zpool_util.h

diff --git a/zfs/zcmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
similarity index 100%
rename from zfs/zcmd/zpool/zpool_vdev.c
rename to cmd/zpool/zpool_vdev.c

diff --git a/zfs/zcmd/ztest/ztest.c b/cmd/ztest/ztest.c
similarity index 100%
rename from zfs/zcmd/ztest/ztest.c
rename to cmd/ztest/ztest.c

diff --git a/zfs/lib/libspl/include/sys/list.h b/lib/libspl/libspl/include/sys/list.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/list.h
rename to lib/libspl/libspl/include/sys/list.h

diff --git a/zfs/lib/libspl/include/sys/list_impl.h b/lib/libspl/libspl/include/sys/list_impl.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/list_impl.h
rename to lib/libspl/libspl/include/sys/list_impl.h

diff --git a/zfs/lib/libspl/list.c b/lib/libspl/libspl/list.c
similarity index 100%
rename from zfs/lib/libspl/list.c
rename to lib/libspl/libspl/list.c

diff --git a/zfs/lib/libspl/mkdirp.c b/lib/libspl/libspl/mkdirp.c
similarity index 100%
rename from zfs/lib/libspl/mkdirp.c
rename to lib/libspl/libspl/mkdirp.c

diff --git a/zfs/lib/libspl/strlcat.c b/lib/libspl/libspl/strlcat.c
similarity index 100%
rename from zfs/lib/libspl/strlcat.c
rename to lib/libspl/libspl/strlcat.c

diff --git a/zfs/lib/libspl/strlcpy.c b/lib/libspl/libspl/strlcpy.c
similarity index 100%
rename from zfs/lib/libspl/strlcpy.c
rename to lib/libspl/libspl/strlcpy.c

diff --git a/zfs/lib/libspl/strnlen.c b/lib/libspl/libspl/strnlen.c
similarity index 100%
rename from zfs/lib/libspl/strnlen.c
rename to lib/libspl/libspl/strnlen.c

diff --git a/zfs/lib/libspl/u8_textprep.c b/lib/libspl/libspl/u8_textprep.c
similarity index 100%
rename from zfs/lib/libspl/u8_textprep.c
rename to lib/libspl/libspl/u8_textprep.c

diff --git a/zfs/lib/libuutil/include/libuutil.h b/lib/libuutil/include/libuutil.h
similarity index 100%
rename from zfs/lib/libuutil/include/libuutil.h
rename to lib/libuutil/include/libuutil.h

diff --git a/zfs/lib/libuutil/include/libuutil_common.h b/lib/libuutil/include/libuutil_common.h
similarity index 100%
rename from zfs/lib/libuutil/include/libuutil_common.h
rename to lib/libuutil/include/libuutil_common.h

diff --git a/zfs/lib/libuutil/include/libuutil_impl.h b/lib/libuutil/include/libuutil_impl.h
similarity index 100%
rename from zfs/lib/libuutil/include/libuutil_impl.h
rename to lib/libuutil/include/libuutil_impl.h

diff --git a/zfs/lib/libuutil/uu_alloc.c b/lib/libuutil/uu_alloc.c
similarity index 100%
rename from zfs/lib/libuutil/uu_alloc.c
rename to lib/libuutil/uu_alloc.c

diff --git a/zfs/lib/libuutil/uu_avl.c b/lib/libuutil/uu_avl.c
similarity index 100%
rename from zfs/lib/libuutil/uu_avl.c
rename to lib/libuutil/uu_avl.c

diff --git a/zfs/lib/libuutil/uu_dprintf.c b/lib/libuutil/uu_dprintf.c
similarity index 100%
rename from zfs/lib/libuutil/uu_dprintf.c
rename to lib/libuutil/uu_dprintf.c

diff --git a/zfs/lib/libuutil/uu_ident.c b/lib/libuutil/uu_ident.c
similarity index 100%
rename from zfs/lib/libuutil/uu_ident.c
rename to lib/libuutil/uu_ident.c

diff --git a/zfs/lib/libuutil/uu_list.c b/lib/libuutil/uu_list.c
similarity index 100%
rename from zfs/lib/libuutil/uu_list.c
rename to lib/libuutil/uu_list.c

diff --git a/zfs/lib/libuutil/uu_misc.c b/lib/libuutil/uu_misc.c
similarity index 100%
rename from zfs/lib/libuutil/uu_misc.c
rename to lib/libuutil/uu_misc.c

diff --git a/zfs/lib/libuutil/uu_open.c b/lib/libuutil/uu_open.c
similarity index 100%
rename from zfs/lib/libuutil/uu_open.c
rename to lib/libuutil/uu_open.c

diff --git a/zfs/lib/libuutil/uu_pname.c b/lib/libuutil/uu_pname.c
similarity index 100%
rename from zfs/lib/libuutil/uu_pname.c
rename to lib/libuutil/uu_pname.c

diff --git a/zfs/lib/libuutil/uu_strtoint.c b/lib/libuutil/uu_strtoint.c
similarity index 100%
rename from zfs/lib/libuutil/uu_strtoint.c
rename to lib/libuutil/uu_strtoint.c

diff --git a/zfs/lib/libzfs/include/libzfs.h b/lib/libzfs/include/libzfs.h
similarity index 100%
rename from zfs/lib/libzfs/include/libzfs.h
rename to lib/libzfs/include/libzfs.h

diff --git a/zfs/lib/libzfs/include/libzfs_impl.h b/lib/libzfs/include/libzfs_impl.h
similarity index 100%
rename from zfs/lib/libzfs/include/libzfs_impl.h
rename to lib/libzfs/include/libzfs_impl.h

diff --git a/zfs/lib/libzfs/libzfs_changelist.c b/lib/libzfs/libzfs_changelist.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_changelist.c
rename to lib/libzfs/libzfs_changelist.c

diff --git a/zfs/lib/libzfs/libzfs_config.c b/lib/libzfs/libzfs_config.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_config.c
rename to lib/libzfs/libzfs_config.c

diff --git a/zfs/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_dataset.c
rename to lib/libzfs/libzfs_dataset.c

diff --git a/zfs/lib/libzfs/libzfs_graph.c b/lib/libzfs/libzfs_graph.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_graph.c
rename to lib/libzfs/libzfs_graph.c

diff --git a/zfs/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_import.c
rename to lib/libzfs/libzfs_import.c

diff --git a/zfs/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_mount.c
rename to lib/libzfs/libzfs_mount.c

diff --git a/zfs/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_pool.c
rename to lib/libzfs/libzfs_pool.c

diff --git a/zfs/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_sendrecv.c
rename to lib/libzfs/libzfs_sendrecv.c

diff --git a/zfs/lib/libzfs/libzfs_status.c b/lib/libzfs/libzfs_status.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_status.c
rename to lib/libzfs/libzfs_status.c

diff --git a/zfs/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
similarity index 100%
rename from zfs/lib/libzfs/libzfs_util.c
rename to lib/libzfs/libzfs_util.c

diff --git a/zfs/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
similarity index 100%
rename from zfs/lib/libzpool/kernel.c
rename to lib/libzpool/kernel.c

diff --git a/zfs/lib/libzpool/taskq.c b/lib/libzpool/taskq.c
similarity index 100%
rename from zfs/lib/libzpool/taskq.c
rename to lib/libzpool/taskq.c

diff --git a/zfs/lib/libzpool/util.c b/lib/libzpool/util.c
similarity index 100%
rename from zfs/lib/libzpool/util.c
rename to lib/libzpool/util.c

diff --git a/zfs/lib/libavl/avl.c b/module/avl/avl.c
similarity index 100%
rename from zfs/lib/libavl/avl.c
rename to module/avl/avl.c

diff --git a/zfs/lib/libavl/include/sys/avl.h b/module/avl/include/sys/avl.h
similarity index 100%
rename from zfs/lib/libavl/include/sys/avl.h
rename to module/avl/include/sys/avl.h

diff --git a/zfs/lib/libavl/include/sys/avl_impl.h b/module/avl/include/sys/avl_impl.h
similarity index 100%
rename from zfs/lib/libavl/include/sys/avl_impl.h
rename to module/avl/include/sys/avl_impl.h

diff --git a/zfs/lib/libnvpair/include/libnvpair.h b/module/nvpair/include/libnvpair.h
similarity index 100%
rename from zfs/lib/libnvpair/include/libnvpair.h
rename to module/nvpair/include/libnvpair.h

diff --git a/zfs/lib/libnvpair/include/sys/nvpair.h b/module/nvpair/include/sys/nvpair.h
similarity index 100%
rename from zfs/lib/libnvpair/include/sys/nvpair.h
rename to module/nvpair/include/sys/nvpair.h

diff --git a/zfs/lib/libnvpair/include/sys/nvpair_impl.h b/module/nvpair/include/sys/nvpair_impl.h
similarity index 100%
rename from zfs/lib/libnvpair/include/sys/nvpair_impl.h
rename to module/nvpair/include/sys/nvpair_impl.h

diff --git a/zfs/lib/libnvpair/libnvpair.c b/module/nvpair/libnvpair.c
similarity index 100%
rename from zfs/lib/libnvpair/libnvpair.c
rename to module/nvpair/libnvpair.c

diff --git a/zfs/lib/libnvpair/nvpair.c b/module/nvpair/nvpair.c
similarity index 100%
rename from zfs/lib/libnvpair/nvpair.c
rename to module/nvpair/nvpair.c

diff --git a/zfs/lib/libnvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c
similarity index 100%
rename from zfs/lib/libnvpair/nvpair_alloc_fixed.c
rename to module/nvpair/nvpair_alloc_fixed.c

diff --git a/zfs/lib/libnvpair/nvpair_alloc_system.c b/module/nvpair/nvpair_alloc_system.c
similarity index 100%
rename from zfs/lib/libnvpair/nvpair_alloc_system.c
rename to module/nvpair/nvpair_alloc_system.c

diff --git a/zfs/lib/libzcommon/include/sys/fm/fs/zfs.h b/module/zcommon/include/sys/fm/fs/zfs.h
similarity index 100%
rename from zfs/lib/libzcommon/include/sys/fm/fs/zfs.h
rename to module/zcommon/include/sys/fm/fs/zfs.h

diff --git a/zfs/lib/libzcommon/include/sys/fs/zfs.h b/module/zcommon/include/sys/fs/zfs.h
similarity index 100%
rename from zfs/lib/libzcommon/include/sys/fs/zfs.h
rename to module/zcommon/include/sys/fs/zfs.h

diff --git a/zfs/lib/libzcommon/include/zfs_comutil.h b/module/zcommon/include/zfs_comutil.h
similarity index 100%
rename from zfs/lib/libzcommon/include/zfs_comutil.h
rename to module/zcommon/include/zfs_comutil.h

diff --git a/zfs/lib/libzcommon/include/zfs_deleg.h b/module/zcommon/include/zfs_deleg.h
similarity index 100%
rename from zfs/lib/libzcommon/include/zfs_deleg.h
rename to module/zcommon/include/zfs_deleg.h

diff --git a/zfs/lib/libzcommon/include/zfs_namecheck.h b/module/zcommon/include/zfs_namecheck.h
similarity index 100%
rename from zfs/lib/libzcommon/include/zfs_namecheck.h
rename to module/zcommon/include/zfs_namecheck.h

diff --git a/zfs/lib/libzcommon/include/zfs_prop.h b/module/zcommon/include/zfs_prop.h
similarity index 100%
rename from zfs/lib/libzcommon/include/zfs_prop.h
rename to module/zcommon/include/zfs_prop.h

diff --git a/zfs/lib/libzcommon/zfs_comutil.c b/module/zcommon/zfs_comutil.c
similarity index 100%
rename from zfs/lib/libzcommon/zfs_comutil.c
rename to module/zcommon/zfs_comutil.c

diff --git a/zfs/lib/libzcommon/zfs_deleg.c b/module/zcommon/zfs_deleg.c
similarity index 100%
rename from zfs/lib/libzcommon/zfs_deleg.c
rename to module/zcommon/zfs_deleg.c

diff --git a/zfs/lib/libzcommon/zfs_namecheck.c b/module/zcommon/zfs_namecheck.c
similarity index 100%
rename from zfs/lib/libzcommon/zfs_namecheck.c
rename to module/zcommon/zfs_namecheck.c

diff --git a/zfs/lib/libzcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
similarity index 100%
rename from zfs/lib/libzcommon/zfs_prop.c
rename to module/zcommon/zfs_prop.c

diff --git a/zfs/lib/libzcommon/zpool_prop.c b/module/zcommon/zpool_prop.c
similarity index 100%
rename from zfs/lib/libzcommon/zpool_prop.c
rename to module/zcommon/zpool_prop.c

diff --git a/zfs/lib/libzcommon/zprop_common.c b/module/zcommon/zprop_common.c
similarity index 100%
rename from zfs/lib/libzcommon/zprop_common.c
rename to module/zcommon/zprop_common.c

diff --git a/zfs/lib/libzpool/arc.c b/module/zfs/arc.c
similarity index 100%
rename from zfs/lib/libzpool/arc.c
rename to module/zfs/arc.c

diff --git a/zfs/lib/libzpool/bplist.c b/module/zfs/bplist.c
similarity index 100%
rename from zfs/lib/libzpool/bplist.c
rename to module/zfs/bplist.c

diff --git a/zfs/lib/libzpool/dbuf.c b/module/zfs/dbuf.c
similarity index 100%
rename from zfs/lib/libzpool/dbuf.c
rename to module/zfs/dbuf.c

diff --git a/zfs/lib/libzpool/dmu.c b/module/zfs/dmu.c
similarity index 100%
rename from zfs/lib/libzpool/dmu.c
rename to module/zfs/dmu.c

diff --git a/zfs/lib/libzpool/dmu_object.c b/module/zfs/dmu_object.c
similarity index 100%
rename from zfs/lib/libzpool/dmu_object.c
rename to module/zfs/dmu_object.c

diff --git a/zfs/lib/libzpool/dmu_objset.c b/module/zfs/dmu_objset.c
similarity index 100%
rename from zfs/lib/libzpool/dmu_objset.c
rename to module/zfs/dmu_objset.c

diff --git a/zfs/lib/libzpool/dmu_send.c b/module/zfs/dmu_send.c
similarity index 100%
rename from zfs/lib/libzpool/dmu_send.c
rename to module/zfs/dmu_send.c

diff --git a/zfs/lib/libzpool/dmu_traverse.c b/module/zfs/dmu_traverse.c
similarity index 100%
rename from zfs/lib/libzpool/dmu_traverse.c
rename to module/zfs/dmu_traverse.c

diff --git a/zfs/lib/libzpool/dmu_tx.c b/module/zfs/dmu_tx.c
similarity index 100%
rename from zfs/lib/libzpool/dmu_tx.c
rename to module/zfs/dmu_tx.c

diff --git a/zfs/lib/libzpool/dmu_zfetch.c b/module/zfs/dmu_zfetch.c
similarity index 100%
rename from zfs/lib/libzpool/dmu_zfetch.c
rename to module/zfs/dmu_zfetch.c

diff --git a/zfs/lib/libzpool/dnode.c b/module/zfs/dnode.c
similarity index 100%
rename from zfs/lib/libzpool/dnode.c
rename to module/zfs/dnode.c

diff --git a/zfs/lib/libzpool/dnode_sync.c b/module/zfs/dnode_sync.c
similarity index 100%
rename from zfs/lib/libzpool/dnode_sync.c
rename to module/zfs/dnode_sync.c

diff --git a/zfs/lib/libzpool/dsl_dataset.c b/module/zfs/dsl_dataset.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_dataset.c
rename to module/zfs/dsl_dataset.c

diff --git a/zfs/lib/libzpool/dsl_deleg.c b/module/zfs/dsl_deleg.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_deleg.c
rename to module/zfs/dsl_deleg.c

diff --git a/zfs/lib/libzpool/dsl_dir.c b/module/zfs/dsl_dir.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_dir.c
rename to module/zfs/dsl_dir.c

diff --git a/zfs/lib/libzpool/dsl_pool.c b/module/zfs/dsl_pool.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_pool.c
rename to module/zfs/dsl_pool.c

diff --git a/zfs/lib/libzpool/dsl_prop.c b/module/zfs/dsl_prop.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_prop.c
rename to module/zfs/dsl_prop.c

diff --git a/zfs/lib/libzpool/dsl_scrub.c b/module/zfs/dsl_scrub.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_scrub.c
rename to module/zfs/dsl_scrub.c

diff --git a/zfs/lib/libzpool/dsl_synctask.c b/module/zfs/dsl_synctask.c
similarity index 100%
rename from zfs/lib/libzpool/dsl_synctask.c
rename to module/zfs/dsl_synctask.c

diff --git a/zfs/lib/libzpool/fletcher.c b/module/zfs/fletcher.c
similarity index 100%
rename from zfs/lib/libzpool/fletcher.c
rename to module/zfs/fletcher.c

diff --git a/zfs/lib/libzpool/gzip.c b/module/zfs/gzip.c
similarity index 100%
rename from zfs/lib/libzpool/gzip.c
rename to module/zfs/gzip.c

diff --git a/zfs/lib/libzpool/include/sys/arc.h b/module/zfs/include/sys/arc.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/arc.h
rename to module/zfs/include/sys/arc.h

diff --git a/zfs/lib/libzpool/include/sys/bplist.h b/module/zfs/include/sys/bplist.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/bplist.h
rename to module/zfs/include/sys/bplist.h

diff --git a/zfs/lib/libzpool/include/sys/dbuf.h b/module/zfs/include/sys/dbuf.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dbuf.h
rename to module/zfs/include/sys/dbuf.h

diff --git a/zfs/lib/libzpool/include/sys/dmu.h b/module/zfs/include/sys/dmu.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dmu.h
rename to module/zfs/include/sys/dmu.h

diff --git a/zfs/lib/libzpool/include/sys/dmu_impl.h b/module/zfs/include/sys/dmu_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dmu_impl.h
rename to module/zfs/include/sys/dmu_impl.h

diff --git a/zfs/lib/libzpool/include/sys/dmu_objset.h b/module/zfs/include/sys/dmu_objset.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dmu_objset.h
rename to module/zfs/include/sys/dmu_objset.h

diff --git a/zfs/lib/libzpool/include/sys/dmu_traverse.h b/module/zfs/include/sys/dmu_traverse.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dmu_traverse.h
rename to module/zfs/include/sys/dmu_traverse.h

diff --git a/zfs/lib/libzpool/include/sys/dmu_tx.h b/module/zfs/include/sys/dmu_tx.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dmu_tx.h
rename to module/zfs/include/sys/dmu_tx.h

diff --git a/zfs/lib/libzpool/include/sys/dmu_zfetch.h b/module/zfs/include/sys/dmu_zfetch.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dmu_zfetch.h
rename to module/zfs/include/sys/dmu_zfetch.h

diff --git a/zfs/lib/libzpool/include/sys/dnode.h b/module/zfs/include/sys/dnode.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dnode.h
rename to module/zfs/include/sys/dnode.h

diff --git a/zfs/lib/libzpool/include/sys/dsl_dataset.h b/module/zfs/include/sys/dsl_dataset.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dsl_dataset.h
rename to module/zfs/include/sys/dsl_dataset.h

diff --git a/zfs/lib/libzpool/include/sys/dsl_deleg.h b/module/zfs/include/sys/dsl_deleg.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dsl_deleg.h
rename to module/zfs/include/sys/dsl_deleg.h

diff --git a/zfs/lib/libzpool/include/sys/dsl_dir.h b/module/zfs/include/sys/dsl_dir.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dsl_dir.h
rename to module/zfs/include/sys/dsl_dir.h

diff --git a/zfs/lib/libzpool/include/sys/dsl_pool.h b/module/zfs/include/sys/dsl_pool.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dsl_pool.h
rename to module/zfs/include/sys/dsl_pool.h

diff --git a/zfs/lib/libzpool/include/sys/dsl_prop.h b/module/zfs/include/sys/dsl_prop.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dsl_prop.h
rename to module/zfs/include/sys/dsl_prop.h

diff --git a/zfs/lib/libzpool/include/sys/dsl_synctask.h b/module/zfs/include/sys/dsl_synctask.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/dsl_synctask.h
rename to module/zfs/include/sys/dsl_synctask.h

diff --git a/zfs/lib/libzpool/include/sys/metaslab.h b/module/zfs/include/sys/metaslab.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/metaslab.h
rename to module/zfs/include/sys/metaslab.h

diff --git a/zfs/lib/libzpool/include/sys/metaslab_impl.h b/module/zfs/include/sys/metaslab_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/metaslab_impl.h
rename to module/zfs/include/sys/metaslab_impl.h

diff --git a/zfs/lib/libzpool/include/sys/refcount.h b/module/zfs/include/sys/refcount.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/refcount.h
rename to module/zfs/include/sys/refcount.h

diff --git a/zfs/lib/libzpool/include/sys/rrwlock.h b/module/zfs/include/sys/rrwlock.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/rrwlock.h
rename to module/zfs/include/sys/rrwlock.h

diff --git a/zfs/lib/libzpool/include/sys/spa.h b/module/zfs/include/sys/spa.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/spa.h
rename to module/zfs/include/sys/spa.h

diff --git a/zfs/lib/libzpool/include/sys/spa_boot.h b/module/zfs/include/sys/spa_boot.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/spa_boot.h
rename to module/zfs/include/sys/spa_boot.h

diff --git a/zfs/lib/libzpool/include/sys/spa_impl.h b/module/zfs/include/sys/spa_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/spa_impl.h
rename to module/zfs/include/sys/spa_impl.h

diff --git a/zfs/lib/libzpool/include/sys/space_map.h b/module/zfs/include/sys/space_map.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/space_map.h
rename to module/zfs/include/sys/space_map.h

diff --git a/zfs/lib/libzpool/include/sys/txg.h b/module/zfs/include/sys/txg.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/txg.h
rename to module/zfs/include/sys/txg.h

diff --git a/zfs/lib/libzpool/include/sys/txg_impl.h b/module/zfs/include/sys/txg_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/txg_impl.h
rename to module/zfs/include/sys/txg_impl.h

diff --git a/zfs/lib/libzpool/include/sys/uberblock.h b/module/zfs/include/sys/uberblock.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/uberblock.h
rename to module/zfs/include/sys/uberblock.h

diff --git a/zfs/lib/libzpool/include/sys/uberblock_impl.h b/module/zfs/include/sys/uberblock_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/uberblock_impl.h
rename to module/zfs/include/sys/uberblock_impl.h

diff --git a/zfs/lib/libzpool/include/sys/unique.h b/module/zfs/include/sys/unique.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/unique.h
rename to module/zfs/include/sys/unique.h

diff --git a/zfs/lib/libzpool/include/sys/vdev.h b/module/zfs/include/sys/vdev.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/vdev.h
rename to module/zfs/include/sys/vdev.h

diff --git a/zfs/lib/libzpool/include/sys/vdev_file.h b/module/zfs/include/sys/vdev_file.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/vdev_file.h
rename to module/zfs/include/sys/vdev_file.h

diff --git a/zfs/lib/libzpool/include/sys/vdev_impl.h b/module/zfs/include/sys/vdev_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/vdev_impl.h
rename to module/zfs/include/sys/vdev_impl.h

diff --git a/zfs/lib/libzpool/include/sys/zap.h b/module/zfs/include/sys/zap.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zap.h
rename to module/zfs/include/sys/zap.h

diff --git a/zfs/lib/libzpool/include/sys/zap_impl.h b/module/zfs/include/sys/zap_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zap_impl.h
rename to module/zfs/include/sys/zap_impl.h

diff --git a/zfs/lib/libzpool/include/sys/zap_leaf.h b/module/zfs/include/sys/zap_leaf.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zap_leaf.h
rename to module/zfs/include/sys/zap_leaf.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_acl.h b/module/zfs/include/sys/zfs_acl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_acl.h
rename to module/zfs/include/sys/zfs_acl.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_context.h b/module/zfs/include/sys/zfs_context.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_context.h
rename to module/zfs/include/sys/zfs_context.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_ctldir.h b/module/zfs/include/sys/zfs_ctldir.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_ctldir.h
rename to module/zfs/include/sys/zfs_ctldir.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_debug.h b/module/zfs/include/sys/zfs_debug.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_debug.h
rename to module/zfs/include/sys/zfs_debug.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_dir.h b/module/zfs/include/sys/zfs_dir.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_dir.h
rename to module/zfs/include/sys/zfs_dir.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_fuid.h b/module/zfs/include/sys/zfs_fuid.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_fuid.h
rename to module/zfs/include/sys/zfs_fuid.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_ioctl.h b/module/zfs/include/sys/zfs_ioctl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_ioctl.h
rename to module/zfs/include/sys/zfs_ioctl.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_rlock.h b/module/zfs/include/sys/zfs_rlock.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_rlock.h
rename to module/zfs/include/sys/zfs_rlock.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_vfsops.h b/module/zfs/include/sys/zfs_vfsops.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_vfsops.h
rename to module/zfs/include/sys/zfs_vfsops.h

diff --git a/zfs/lib/libzpool/include/sys/zfs_znode.h b/module/zfs/include/sys/zfs_znode.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zfs_znode.h
rename to module/zfs/include/sys/zfs_znode.h

diff --git a/zfs/lib/libzpool/include/sys/zil.h b/module/zfs/include/sys/zil.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zil.h
rename to module/zfs/include/sys/zil.h

diff --git a/zfs/lib/libzpool/include/sys/zil_impl.h b/module/zfs/include/sys/zil_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zil_impl.h
rename to module/zfs/include/sys/zil_impl.h

diff --git a/zfs/lib/libzpool/include/sys/zio.h b/module/zfs/include/sys/zio.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zio.h
rename to module/zfs/include/sys/zio.h

diff --git a/zfs/lib/libzpool/include/sys/zio_checksum.h b/module/zfs/include/sys/zio_checksum.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zio_checksum.h
rename to module/zfs/include/sys/zio_checksum.h

diff --git a/zfs/lib/libzpool/include/sys/zio_compress.h b/module/zfs/include/sys/zio_compress.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zio_compress.h
rename to module/zfs/include/sys/zio_compress.h

diff --git a/zfs/lib/libzpool/include/sys/zio_impl.h b/module/zfs/include/sys/zio_impl.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zio_impl.h
rename to module/zfs/include/sys/zio_impl.h

diff --git a/zfs/lib/libzpool/include/sys/zvol.h b/module/zfs/include/sys/zvol.h
similarity index 100%
rename from zfs/lib/libzpool/include/sys/zvol.h
rename to module/zfs/include/sys/zvol.h

diff --git a/zfs/lib/libzpool/lzjb.c b/module/zfs/lzjb.c
similarity index 100%
rename from zfs/lib/libzpool/lzjb.c
rename to module/zfs/lzjb.c

diff --git a/zfs/lib/libzpool/metaslab.c b/module/zfs/metaslab.c
similarity index 100%
rename from zfs/lib/libzpool/metaslab.c
rename to module/zfs/metaslab.c

diff --git a/zfs/lib/libzpool/refcount.c b/module/zfs/refcount.c
similarity index 100%
rename from zfs/lib/libzpool/refcount.c
rename to module/zfs/refcount.c

diff --git a/zfs/lib/libzpool/rrwlock.c b/module/zfs/rrwlock.c
similarity index 100%
rename from zfs/lib/libzpool/rrwlock.c
rename to module/zfs/rrwlock.c

diff --git a/zfs/lib/libzpool/sha256.c b/module/zfs/sha256.c
similarity index 100%
rename from zfs/lib/libzpool/sha256.c
rename to module/zfs/sha256.c

diff --git a/zfs/lib/libzpool/spa.c b/module/zfs/spa.c
similarity index 100%
rename from zfs/lib/libzpool/spa.c
rename to module/zfs/spa.c

diff --git a/zfs/lib/libzpool/spa_boot.c b/module/zfs/spa_boot.c
similarity index 100%
rename from zfs/lib/libzpool/spa_boot.c
rename to module/zfs/spa_boot.c

diff --git a/zfs/lib/libzpool/spa_config.c b/module/zfs/spa_config.c
similarity index 100%
rename from zfs/lib/libzpool/spa_config.c
rename to module/zfs/spa_config.c

diff --git a/zfs/lib/libzpool/spa_errlog.c b/module/zfs/spa_errlog.c
similarity index 100%
rename from zfs/lib/libzpool/spa_errlog.c
rename to module/zfs/spa_errlog.c

diff --git a/zfs/lib/libzpool/spa_history.c b/module/zfs/spa_history.c
similarity index 100%
rename from zfs/lib/libzpool/spa_history.c
rename to module/zfs/spa_history.c

diff --git a/zfs/lib/libzpool/spa_misc.c b/module/zfs/spa_misc.c
similarity index 100%
rename from zfs/lib/libzpool/spa_misc.c
rename to module/zfs/spa_misc.c

diff --git a/zfs/lib/libzpool/space_map.c b/module/zfs/space_map.c
similarity index 100%
rename from zfs/lib/libzpool/space_map.c
rename to module/zfs/space_map.c

diff --git a/zfs/lib/libzpool/txg.c b/module/zfs/txg.c
similarity index 100%
rename from zfs/lib/libzpool/txg.c
rename to module/zfs/txg.c

diff --git a/zfs/lib/libzpool/uberblock.c b/module/zfs/uberblock.c
similarity index 100%
rename from zfs/lib/libzpool/uberblock.c
rename to module/zfs/uberblock.c

diff --git a/zfs/lib/libzpool/unique.c b/module/zfs/unique.c
similarity index 100%
rename from zfs/lib/libzpool/unique.c
rename to module/zfs/unique.c

diff --git a/zfs/lib/libzpool/vdev.c b/module/zfs/vdev.c
similarity index 100%
rename from zfs/lib/libzpool/vdev.c
rename to module/zfs/vdev.c

diff --git a/zfs/lib/libzpool/vdev_cache.c b/module/zfs/vdev_cache.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_cache.c
rename to module/zfs/vdev_cache.c

diff --git a/zfs/lib/libzpool/vdev_file.c b/module/zfs/vdev_file.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_file.c
rename to module/zfs/vdev_file.c

diff --git a/zfs/lib/libzpool/vdev_label.c b/module/zfs/vdev_label.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_label.c
rename to module/zfs/vdev_label.c

diff --git a/zfs/lib/libzpool/vdev_mirror.c b/module/zfs/vdev_mirror.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_mirror.c
rename to module/zfs/vdev_mirror.c

diff --git a/zfs/lib/libzpool/vdev_missing.c b/module/zfs/vdev_missing.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_missing.c
rename to module/zfs/vdev_missing.c

diff --git a/zfs/lib/libzpool/vdev_queue.c b/module/zfs/vdev_queue.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_queue.c
rename to module/zfs/vdev_queue.c

diff --git a/zfs/lib/libzpool/vdev_raidz.c b/module/zfs/vdev_raidz.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_raidz.c
rename to module/zfs/vdev_raidz.c

diff --git a/zfs/lib/libzpool/vdev_root.c b/module/zfs/vdev_root.c
similarity index 100%
rename from zfs/lib/libzpool/vdev_root.c
rename to module/zfs/vdev_root.c

diff --git a/zfs/lib/libzpool/zap.c b/module/zfs/zap.c
similarity index 100%
rename from zfs/lib/libzpool/zap.c
rename to module/zfs/zap.c

diff --git a/zfs/lib/libzpool/zap_leaf.c b/module/zfs/zap_leaf.c
similarity index 100%
rename from zfs/lib/libzpool/zap_leaf.c
rename to module/zfs/zap_leaf.c

diff --git a/zfs/lib/libzpool/zap_micro.c b/module/zfs/zap_micro.c
similarity index 100%
rename from zfs/lib/libzpool/zap_micro.c
rename to module/zfs/zap_micro.c

diff --git a/zfs/lib/libzpool/zfs_acl.c b/module/zfs/zfs_acl.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_acl.c
rename to module/zfs/zfs_acl.c

diff --git a/zfs/lib/libzpool/zfs_byteswap.c b/module/zfs/zfs_byteswap.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_byteswap.c
rename to module/zfs/zfs_byteswap.c

diff --git a/zfs/lib/libzpool/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_ctldir.c
rename to module/zfs/zfs_ctldir.c

diff --git a/zfs/lib/libzpool/zfs_dir.c b/module/zfs/zfs_dir.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_dir.c
rename to module/zfs/zfs_dir.c

diff --git a/zfs/lib/libzpool/zfs_fm.c b/module/zfs/zfs_fm.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_fm.c
rename to module/zfs/zfs_fm.c

diff --git a/zfs/lib/libzpool/zfs_fuid.c b/module/zfs/zfs_fuid.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_fuid.c
rename to module/zfs/zfs_fuid.c

diff --git a/zfs/lib/libzpool/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_ioctl.c
rename to module/zfs/zfs_ioctl.c

diff --git a/zfs/lib/libzpool/zfs_log.c b/module/zfs/zfs_log.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_log.c
rename to module/zfs/zfs_log.c

diff --git a/zfs/lib/libzpool/zfs_replay.c b/module/zfs/zfs_replay.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_replay.c
rename to module/zfs/zfs_replay.c

diff --git a/zfs/lib/libzpool/zfs_rlock.c b/module/zfs/zfs_rlock.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_rlock.c
rename to module/zfs/zfs_rlock.c

diff --git a/zfs/lib/libzpool/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_vfsops.c
rename to module/zfs/zfs_vfsops.c

diff --git a/zfs/lib/libzpool/zfs_vnops.c b/module/zfs/zfs_vnops.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_vnops.c
rename to module/zfs/zfs_vnops.c

diff --git a/zfs/lib/libzpool/zfs_znode.c b/module/zfs/zfs_znode.c
similarity index 100%
rename from zfs/lib/libzpool/zfs_znode.c
rename to module/zfs/zfs_znode.c

diff --git a/zfs/lib/libzpool/zil.c b/module/zfs/zil.c
similarity index 100%
rename from zfs/lib/libzpool/zil.c
rename to module/zfs/zil.c

diff --git a/zfs/lib/libzpool/zio.c b/module/zfs/zio.c
similarity index 100%
rename from zfs/lib/libzpool/zio.c
rename to module/zfs/zio.c

diff --git a/zfs/lib/libzpool/zio_checksum.c b/module/zfs/zio_checksum.c
similarity index 100%
rename from zfs/lib/libzpool/zio_checksum.c
rename to module/zfs/zio_checksum.c

diff --git a/zfs/lib/libzpool/zio_compress.c b/module/zfs/zio_compress.c
similarity index 100%
rename from zfs/lib/libzpool/zio_compress.c
rename to module/zfs/zio_compress.c

diff --git a/zfs/lib/libzpool/zio_inject.c b/module/zfs/zio_inject.c
similarity index 100%
rename from zfs/lib/libzpool/zio_inject.c
rename to module/zfs/zio_inject.c

diff --git a/zfs/lib/libzpool/zvol.c b/module/zfs/zvol.c
similarity index 100%
rename from zfs/lib/libzpool/zvol.c
rename to module/zfs/zvol.c

diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh
index 2aa2425..158457a 100755 (executable)
--- a/scripts/update-zfs.sh
+++ b/scripts/update-zfs.sh
@@ -49,35 +49,54 @@ SRC_UTS=${SRC}/usr/src/uts
 SRC_UCM=${SRC}/usr/src/uts/common
 SRC_ZLIB=${SRC}/usr/src/uts/common/fs/zfs
 
-DST_LIB=${DST}/zfs/lib
-DST_CMD=${DST}/zfs/zcmd
+DST_MOD=${DST}/module
+DST_LIB=${DST}/lib
+DST_CMD=${DST}/cmd
 
 rm -Rf ${DST}/zfs
 
 echo
 echo "------------- Updating ZFS from OpenSolaris ${RELEASE} ---------------"
-echo "* zfs/lib/libavl"
-mkdir -p ${DST_LIB}/libavl/include/sys/
-cp ${SRC_CM}/avl/avl.c                         ${DST_LIB}/libavl/
-cp ${SRC_UCM}/sys/avl.h                                ${DST_LIB}/libavl/include/sys/
-cp ${SRC_UCM}/sys/avl_impl.h                   ${DST_LIB}/libavl/include/sys/
-
-echo "* zfs/lib/libnvpair"
-mkdir -p ${DST_LIB}/libnvpair/include/sys/
-cp ${SRC_CM}/nvpair/nvpair.c                   ${DST_LIB}/libnvpair/
-cp ${SRC_LIB}/libnvpair/libnvpair.c            ${DST_LIB}/libnvpair/
-cp ${SRC_UCM}/os/nvpair_alloc_system.c         ${DST_LIB}/libnvpair/
-cp ${SRC_CM}/nvpair/nvpair_alloc_fixed.c       ${DST_LIB}/libnvpair/
-cp ${SRC_LIB}/libnvpair/libnvpair.h            ${DST_LIB}/libnvpair/include/
-cp ${SRC_UCM}/sys/nvpair.h                     ${DST_LIB}/libnvpair/include/sys/
-cp ${SRC_UCM}/sys/nvpair_impl.h                        ${DST_LIB}/libnvpair/include/sys/
-
-echo "* zfs/lib/libuutil"
-mkdir -p ${DST_LIB}/libuutil/include/
-cp ${SRC_LIB}/libuutil/common/*.c              ${DST_LIB}/libuutil/
-cp ${SRC_LIB}/libuutil/common/*.h              ${DST_LIB}/libuutil/include/
+echo "* module/avl + lib/libavl"
+mkdir -p ${DST_MOD}/avl/include/sys/
+cp ${SRC_CM}/avl/avl.c                         ${DST_MOD}/avl/
+cp ${SRC_UCM}/sys/avl.h                                ${DST_MOD}/avl/include/sys/
+cp ${SRC_UCM}/sys/avl_impl.h                   ${DST_MOD}/avl/include/sys/
+
+echo "* module/nvpair + lib/libnvpair"
+mkdir -p ${DST_MOD}/nvpair/include/sys/
+cp ${SRC_CM}/nvpair/nvpair.c                   ${DST_MOD}/nvpair/
+cp ${SRC_LIB}/libnvpair/libnvpair.c            ${DST_MOD}/nvpair/
+cp ${SRC_UCM}/os/nvpair_alloc_system.c         ${DST_MOD}/nvpair/
+cp ${SRC_CM}/nvpair/nvpair_alloc_fixed.c       ${DST_MOD}/nvpair/
+cp ${SRC_LIB}/libnvpair/libnvpair.h            ${DST_MOD}/nvpair/include/
+cp ${SRC_UCM}/sys/nvpair.h                     ${DST_MOD}/nvpair/include/sys/
+cp ${SRC_UCM}/sys/nvpair_impl.h                        ${DST_MOD}/nvpair/include/sys/
+
+echo "* module/zcommon + lib/libzcommon"
+mkdir -p ${DST_MOD}/zcommon/include/sys/fs/
+mkdir -p ${DST_MOD}/zcommon/include/sys/fm/fs/
+cp ${SRC_CM}/zfs/*.c                           ${DST_MOD}/zcommon/
+cp ${SRC_CM}/zfs/*.h                           ${DST_MOD}/zcommon/include/
+cp ${SRC_UCM}/sys/fs/zfs.h                     ${DST_MOD}/zcommon/include/sys/fs/
+cp ${SRC_UCM}/sys/fm/fs/zfs.h                  ${DST_MOD}/zcommon/include/sys/fm/fs/
+
+echo "* module/zfs"
+mkdir -p ${DST_MOD}/zpool/include/sys/
+cp ${SRC_UTS}/intel/zfs/spa_boot.c             ${DST_MOD}/zfs/
+cp ${SRC_ZLIB}/*.c                             ${DST_MOD}/zfs/
+cp ${SRC_ZLIB}/sys/*.h                         ${DST_MOD}/zfs/include/sys/
+rm ${DST_MOD}/zfs/vdev_disk.c
+rm ${DST_MOD}/zfs/include/sys/vdev_disk.h
+
+echo " lib/libzpool"
+mkdir -p ${DST_LIB}/libzpool/include/sys/
+cp ${SRC_LIB}/libzpool/common/kernel.c         ${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/taskq.c          ${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/util.c           ${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h        ${DST_LIB}/libzpool/include/sys/
 
-echo "* zfs/lib/libspl"
+echo "* lib/libspl"
 mkdir -p ${DST_LIB}/libspl/include/sys/
 cp ${SRC_LIB}/libc/port/gen/strlcat.c          ${DST_LIB}/libspl/
 cp ${SRC_LIB}/libc/port/gen/strlcpy.c          ${DST_LIB}/libspl/
@@ -88,55 +107,40 @@ cp ${SRC_UCM}/os/list.c                            ${DST_LIB}/libspl/
 cp ${SRC_UCM}/sys/list.h                       ${DST_LIB}/libspl/include/sys/
 cp ${SRC_UCM}/sys/list_impl.h                  ${DST_LIB}/libspl/include/sys/
 
-echo "* zfs/lib/libzcommon"
-mkdir -p ${DST_LIB}/libzcommon/include/sys/fs/
-mkdir -p ${DST_LIB}/libzcommon/include/sys/fm/fs/
-cp ${SRC_CM}/zfs/*.c                           ${DST_LIB}/libzcommon/
-cp ${SRC_CM}/zfs/*.h                           ${DST_LIB}/libzcommon/include/
-cp ${SRC_UCM}/sys/fs/zfs.h                     ${DST_LIB}/libzcommon/include/sys/fs/
-cp ${SRC_UCM}/sys/fm/fs/zfs.h                  ${DST_LIB}/libzcommon/include/sys/fm/fs/
+echo "* lib/libuutil"
+mkdir -p ${DST_LIB}/libuutil/include/
+cp ${SRC_LIB}/libuutil/common/*.c              ${DST_LIB}/libuutil/
+cp ${SRC_LIB}/libuutil/common/*.h              ${DST_LIB}/libuutil/include/
 
-echo "* zfs/lib/libzpool"
-mkdir -p ${DST_LIB}/libzpool/include/sys/
-cp ${SRC_LIB}/libzpool/common/kernel.c         ${DST_LIB}/libzpool/
-cp ${SRC_LIB}/libzpool/common/taskq.c          ${DST_LIB}/libzpool/
-cp ${SRC_LIB}/libzpool/common/util.c           ${DST_LIB}/libzpool/
-#cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h       ${DST_LIB}/libzpool/include/sys/
-cp ${SRC_ZLIB}/*.c                             ${DST_LIB}/libzpool/
-cp ${SRC_UTS}/intel/zfs/spa_boot.c             ${DST_LIB}/libzpool/
-cp ${SRC_ZLIB}/sys/*.h                         ${DST_LIB}/libzpool/include/sys/
-rm ${DST_LIB}/libzpool/vdev_disk.c
-rm ${DST_LIB}/libzpool/include/sys/vdev_disk.h
-
-echo "* zfs/lib/libzfs"
+echo "* lib/libzfs"
 mkdir -p ${DST_LIB}/libzfs/include/
 cp ${SRC_LIB}/libzfs/common/*.c                        ${DST_LIB}/libzfs/
 cp ${SRC_LIB}/libzfs/common/*.h                        ${DST_LIB}/libzfs/include/
 
-echo "* zfs/zcmd/zpool"
+echo "* cmd/zpool"
 mkdir -p ${DST_CMD}/zpool
 cp ${SRC_CMD}/zpool/*.c                                ${DST_CMD}/zpool/
 cp ${SRC_CMD}/zpool/*.h                                ${DST_CMD}/zpool/
 
-echo "* zfs/zcmd/zfs"
+echo "* cmd/zfs"
 mkdir -p ${DST_CMD}/zfs
 cp ${SRC_CMD}/zfs/*.c                          ${DST_CMD}/zfs/
 cp ${SRC_CMD}/zfs/*.h                          ${DST_CMD}/zfs/
 
-echo "* zfs/zcmd/zdb"
+echo "* cmd/zdb"
 mkdir -p ${DST_CMD}/zdb/
 cp ${SRC_CMD}/zdb/*.c                          ${DST_CMD}/zdb/
 
-echo "* zfs/zcmd/zdump"
+echo "* cmd/zdump"
 mkdir -p ${DST_CMD}/zdump
 cp ${SRC_CMD}/zdump/*.c                                ${DST_CMD}/zdump/
 
-echo "* zfs/zcmd/zinject"
+echo "* cmd/zinject"
 mkdir -p ${DST_CMD}/zinject
 cp ${SRC_CMD}/zinject/*.c                      ${DST_CMD}/zinject/
 cp ${SRC_CMD}/zinject/*.h                      ${DST_CMD}/zinject/
 
-echo "* zfs/zcmd/ztest"
+echo "* cmd/ztest"
 mkdir -p ${DST_CMD}/ztest
 cp ${SRC_CMD}/ztest/*.c                                ${DST_CMD}/ztest/