diff --git a/app-backup/urbackup/Manifest b/app-backup/urbackup-client/Manifest
similarity index 100%
rename from app-backup/urbackup/Manifest
rename to app-backup/urbackup-client/Manifest
diff --git a/app-backup/urbackup/files/btrfs_create_filesystem_snapshot b/app-backup/urbackup-client/files/btrfs_create_filesystem_snapshot
similarity index 100%
rename from app-backup/urbackup/files/btrfs_create_filesystem_snapshot
rename to app-backup/urbackup-client/files/btrfs_create_filesystem_snapshot
diff --git a/app-backup/urbackup/files/btrfs_remove_filesystem_snapshot b/app-backup/urbackup-client/files/btrfs_remove_filesystem_snapshot
similarity index 100%
rename from app-backup/urbackup/files/btrfs_remove_filesystem_snapshot
rename to app-backup/urbackup-client/files/btrfs_remove_filesystem_snapshot
diff --git a/app-backup/urbackup/files/dattobd_create_filesystem_snapshot b/app-backup/urbackup-client/files/dattobd_create_filesystem_snapshot
similarity index 100%
rename from app-backup/urbackup/files/dattobd_create_filesystem_snapshot
rename to app-backup/urbackup-client/files/dattobd_create_filesystem_snapshot
diff --git a/app-backup/urbackup/files/dattobd_remove_filesystem_snapshot b/app-backup/urbackup-client/files/dattobd_remove_filesystem_snapshot
similarity index 100%
rename from app-backup/urbackup/files/dattobd_remove_filesystem_snapshot
rename to app-backup/urbackup-client/files/dattobd_remove_filesystem_snapshot
diff --git a/app-backup/urbackup/files/logrotate_urbackupclient b/app-backup/urbackup-client/files/logrotate_urbackupclient
similarity index 100%
rename from app-backup/urbackup/files/logrotate_urbackupclient
rename to app-backup/urbackup-client/files/logrotate_urbackupclient
diff --git a/app-backup/urbackup/files/lvm_create_filesystem_snapshot b/app-backup/urbackup-client/files/lvm_create_filesystem_snapshot
similarity index 100%
rename from app-backup/urbackup/files/lvm_create_filesystem_snapshot
rename to app-backup/urbackup-client/files/lvm_create_filesystem_snapshot
diff --git a/app-backup/urbackup/files/lvm_remove_filesystem_snapshot b/app-backup/urbackup-client/files/lvm_remove_filesystem_snapshot
similarity index 100%
rename from app-backup/urbackup/files/lvm_remove_filesystem_snapshot
rename to app-backup/urbackup-client/files/lvm_remove_filesystem_snapshot
diff --git a/app-backup/urbackup/files/snapshot.cfg b/app-backup/urbackup-client/files/snapshot.cfg
similarity index 100%
rename from app-backup/urbackup/files/snapshot.cfg
rename to app-backup/urbackup-client/files/snapshot.cfg
diff --git a/app-backup/urbackup/files/urbackup-client-2.0.36-autoupdate.patch b/app-backup/urbackup-client/files/urbackup-client-2.0.36-autoupdate.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.0.36-autoupdate.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.0.36-autoupdate.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.0.36-conf.patch b/app-backup/urbackup-client/files/urbackup-client-2.0.36-conf.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.0.36-conf.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.0.36-conf.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.0.36-etc-perms.patch b/app-backup/urbackup-client/files/urbackup-client-2.0.36-etc-perms.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.0.36-etc-perms.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.0.36-etc-perms.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.0.36-gcc-fortify.patch b/app-backup/urbackup-client/files/urbackup-client-2.0.36-gcc-fortify.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.0.36-gcc-fortify.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.0.36-gcc-fortify.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.0.36-locale.patch b/app-backup/urbackup-client/files/urbackup-client-2.0.36-locale.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.0.36-locale.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.0.36-locale.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.0.36-manpage.patch b/app-backup/urbackup-client/files/urbackup-client-2.0.36-manpage.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.0.36-manpage.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.0.36-manpage.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.1.7-autoupdate.patch b/app-backup/urbackup-client/files/urbackup-client-2.1.7-autoupdate.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.1.7-autoupdate.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.1.7-autoupdate.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.1.7-conf.patch b/app-backup/urbackup-client/files/urbackup-client-2.1.7-conf.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.1.7-conf.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.1.7-conf.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.1.7-etc-perms.patch b/app-backup/urbackup-client/files/urbackup-client-2.1.7-etc-perms.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.1.7-etc-perms.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.1.7-etc-perms.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.1.7-gcc-fortify.patch b/app-backup/urbackup-client/files/urbackup-client-2.1.7-gcc-fortify.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.1.7-gcc-fortify.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.1.7-gcc-fortify.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.1.7-locale.patch b/app-backup/urbackup-client/files/urbackup-client-2.1.7-locale.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.1.7-locale.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.1.7-locale.patch
diff --git a/app-backup/urbackup/files/urbackup-client-2.1.7-manpage.patch b/app-backup/urbackup-client/files/urbackup-client-2.1.7-manpage.patch
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client-2.1.7-manpage.patch
rename to app-backup/urbackup-client/files/urbackup-client-2.1.7-manpage.patch
diff --git a/app-backup/urbackup/files/urbackup-client.service b/app-backup/urbackup-client/files/urbackup-client.service
similarity index 100%
rename from app-backup/urbackup/files/urbackup-client.service
rename to app-backup/urbackup-client/files/urbackup-client.service
diff --git a/app-backup/urbackup/files/urbackupclient b/app-backup/urbackup-client/files/urbackupclient
similarity index 100%
rename from app-backup/urbackup/files/urbackupclient
rename to app-backup/urbackup-client/files/urbackupclient
diff --git a/app-backup/urbackup/metadata.xml b/app-backup/urbackup-client/metadata.xml
similarity index 100%
rename from app-backup/urbackup/metadata.xml
rename to app-backup/urbackup-client/metadata.xml
diff --git a/app-backup/urbackup/urbackup-client-2.0.36.ebuild b/app-backup/urbackup-client/urbackup-client-2.0.36.ebuild
similarity index 100%
rename from app-backup/urbackup/urbackup-client-2.0.36.ebuild
rename to app-backup/urbackup-client/urbackup-client-2.0.36.ebuild
diff --git a/app-backup/urbackup/urbackup-client-2.1.7.ebuild b/app-backup/urbackup-client/urbackup-client-2.1.7.ebuild
similarity index 100%
rename from app-backup/urbackup/urbackup-client-2.1.7.ebuild
rename to app-backup/urbackup-client/urbackup-client-2.1.7.ebuild