[lxc-devel] [lxd/master] Allow `user.*` keys everywhere we store configuration

grant-he on Github lxc-bot at linuxcontainers.org
Mon Nov 30 23:37:32 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 465 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20201130/f6d09962/attachment-0001.bin>
-------------- next part --------------
From abfce864c6f27552e2e98d3ff7b250eea67f3144 Mon Sep 17 00:00:00 2001
From: JLRDRAGON92000 <jlrdragon at gmail.com>
Date: Tue, 17 Nov 2020 18:44:11 -0600
Subject: [PATCH 1/4] converted all references to this repository

---
 client/connection.go                          |  6 +-
 client/events.go                              |  2 +-
 client/interfaces.go                          |  6 +-
 client/lxd.go                                 |  6 +-
 client/lxd_certificates.go                    |  2 +-
 client/lxd_cluster.go                         |  2 +-
 client/lxd_containers.go                      | 10 +--
 client/lxd_events.go                          |  4 +-
 client/lxd_images.go                          | 10 +--
 client/lxd_instances.go                       | 10 +--
 client/lxd_networks.go                        |  2 +-
 client/lxd_operations.go                      |  2 +-
 client/lxd_profiles.go                        |  2 +-
 client/lxd_projects.go                        |  2 +-
 client/lxd_server.go                          |  4 +-
 client/lxd_storage_pools.go                   |  2 +-
 client/lxd_storage_volumes.go                 |  8 +--
 client/operations.go                          |  2 +-
 client/simplestreams.go                       |  2 +-
 client/simplestreams_images.go                |  4 +-
 client/util.go                                |  2 +-
 fuidshift/main.go                             |  2 +-
 fuidshift/main_shift.go                       |  2 +-
 lxc-to-lxd/config.go                          |  2 +-
 lxc-to-lxd/main.go                            |  2 +-
 lxc-to-lxd/main_migrate.go                    | 12 ++--
 lxc-to-lxd/main_netcat.go                     |  2 +-
 lxc-to-lxd/transfer.go                        |  6 +-
 lxc-to-lxd/utils.go                           |  4 +-
 lxc/action.go                                 | 12 ++--
 lxc/alias.go                                  |  6 +-
 lxc/cluster.go                                | 12 ++--
 lxc/config.go                                 | 12 ++--
 lxc/config/cert.go                            |  2 +-
 lxc/config/file.go                            |  2 +-
 lxc/config/remote.go                          |  4 +-
 lxc/config_device.go                          |  4 +-
 lxc/config_metadata.go                        | 10 +--
 lxc/config_template.go                        | 10 +--
 lxc/config_trust.go                           | 10 +--
 lxc/console.go                                | 14 ++--
 lxc/console_unix.go                           |  2 +-
 lxc/copy.go                                   | 14 ++--
 lxc/delete.go                                 | 10 +--
 lxc/exec.go                                   | 12 ++--
 lxc/exec_unix.go                              |  4 +-
 lxc/exec_windows.go                           |  4 +-
 lxc/export.go                                 | 12 ++--
 lxc/file.go                                   | 18 ++---
 lxc/image.go                                  | 14 ++--
 lxc/image_alias.go                            |  8 +--
 lxc/import.go                                 | 14 ++--
 lxc/info.go                                   | 14 ++--
 lxc/init.go                                   | 14 ++--
 lxc/launch.go                                 |  8 +--
 lxc/list.go                                   | 16 ++---
 lxc/list_test.go                              |  4 +-
 lxc/main.go                                   | 16 ++---
 lxc/main_aliases.go                           |  6 +-
 lxc/main_test.go                              |  2 +-
 lxc/manpage.go                                |  6 +-
 lxc/monitor.go                                | 12 ++--
 lxc/move.go                                   | 10 +--
 lxc/network.go                                | 14 ++--
 lxc/operation.go                              |  6 +-
 lxc/profile.go                                | 12 ++--
 lxc/project.go                                | 12 ++--
 lxc/publish.go                                | 12 ++--
 lxc/query.go                                  |  6 +-
 lxc/remote.go                                 | 14 ++--
 lxc/rename.go                                 |  4 +-
 lxc/restore.go                                |  8 +--
 lxc/snapshot.go                               |  8 +--
 lxc/storage.go                                | 14 ++--
 lxc/storage_volume.go                         | 18 ++---
 lxc/utils.go                                  |  8 +--
 lxc/utils/cancel.go                           |  4 +-
 lxc/utils/progress.go                         |  6 +-
 lxc/utils/table.go                            |  2 +-
 lxc/utils_test.go                             |  2 +-
 lxc/version.go                                |  6 +-
 lxd-agent/api.go                              |  2 +-
 lxd-agent/api_1.0.go                          |  8 +--
 lxd-agent/daemon.go                           |  2 +-
 lxd-agent/devlxd.go                           | 10 +--
 lxd-agent/events.go                           |  8 +--
 lxd-agent/exec.go                             | 14 ++--
 lxd-agent/file.go                             |  4 +-
 lxd-agent/main.go                             |  2 +-
 lxd-agent/main_agent.go                       | 12 ++--
 lxd-agent/network.go                          |  4 +-
 lxd-agent/operations.go                       | 10 +--
 lxd-agent/server.go                           |  8 +--
 lxd-agent/state.go                            |  6 +-
 lxd-agent/templates.go                        |  4 +-
 lxd-benchmark/benchmark/benchmark.go          |  8 +--
 lxd-benchmark/benchmark/operation.go          |  4 +-
 lxd-benchmark/main.go                         |  8 +--
 lxd-benchmark/main_delete.go                  |  2 +-
 lxd-benchmark/main_init.go                    |  2 +-
 lxd-benchmark/main_launch.go                  |  2 +-
 lxd-benchmark/main_start.go                   |  2 +-
 lxd-benchmark/main_stop.go                    |  2 +-
 lxd-p2c/main.go                               |  2 +-
 lxd-p2c/main_migrate.go                       |  6 +-
 lxd-p2c/main_netcat.go                        |  2 +-
 lxd-p2c/transfer.go                           |  6 +-
 lxd-p2c/utils.go                              | 10 +--
 lxd/api.go                                    | 12 ++--
 lxd/api_1.0.go                                | 26 +++----
 lxd/api_cluster.go                            | 28 ++++----
 lxd/api_cluster_test.go                       |  8 +--
 lxd/api_internal.go                           | 36 +++++-----
 lxd/api_networks_test.go                      |  2 +-
 lxd/api_project.go                            | 24 +++----
 lxd/api_storage_pools_test.go                 |  2 +-
 lxd/apparmor/apparmor.go                      |  6 +-
 lxd/apparmor/instance.go                      | 12 ++--
 lxd/apparmor/instance_forkproxy.go            | 10 +--
 lxd/apparmor/network.go                       |  2 +-
 lxd/apparmor/network_dnsmasq.go               |  4 +-
 lxd/apparmor/network_forkdns.go               |  6 +-
 lxd/backup.go                                 | 38 +++++-----
 lxd/backup/backup_common.go                   |  2 +-
 lxd/backup/backup_config.go                   |  6 +-
 lxd/backup/backup_info.go                     |  2 +-
 lxd/backup/backup_instance.go                 |  8 +--
 lxd/backup/backup_utils.go                    |  2 +-
 lxd/backup/backup_volume.go                   | 10 +--
 lxd/certificates.go                           | 22 +++---
 lxd/cgroup/abstraction.go                     |  2 +-
 lxd/cgroup/file.go                            |  2 +-
 lxd/cgroup/init.go                            |  4 +-
 lxd/cluster/config.go                         |  4 +-
 lxd/cluster/config_test.go                    |  4 +-
 lxd/cluster/connect.go                        | 16 ++---
 lxd/cluster/events.go                         | 14 ++--
 lxd/cluster/gateway.go                        |  8 +--
 lxd/cluster/gateway_export_test.go            |  4 +-
 lxd/cluster/gateway_test.go                   |  8 +--
 lxd/cluster/heartbeat.go                      |  8 +--
 lxd/cluster/heartbeat_test.go                 | 12 ++--
 lxd/cluster/info.go                           | 10 +--
 lxd/cluster/membership.go                     | 22 +++---
 lxd/cluster/membership_test.go                | 14 ++--
 lxd/cluster/migrate.go                        |  4 +-
 lxd/cluster/migrate_test.go                   |  4 +-
 lxd/cluster/notify.go                         | 12 ++--
 lxd/cluster/notify_test.go                    | 16 ++---
 lxd/cluster/raft_test.go                      |  6 +-
 lxd/cluster/recover.go                        |  4 +-
 lxd/cluster/resolve.go                        |  2 +-
 lxd/cluster/tls.go                            |  4 +-
 lxd/cluster/upgrade.go                        | 12 ++--
 lxd/cluster/upgrade_test.go                   |  8 +--
 lxd/config/map.go                             |  2 +-
 lxd/config/map_test.go                        |  2 +-
 lxd/config/safe.go                            |  4 +-
 lxd/config/safe_test.go                       |  2 +-
 lxd/config/schema.go                          |  2 +-
 lxd/config/schema_test.go                     |  2 +-
 lxd/config/validators_test.go                 |  2 +-
 lxd/daemon.go                                 | 54 +++++++-------
 lxd/daemon_config.go                          | 10 +--
 lxd/daemon_images.go                          | 28 ++++----
 lxd/daemon_integration_test.go                |  8 +--
 lxd/daemon_storage.go                         | 16 ++---
 lxd/db/backups.go                             |  4 +-
 lxd/db/certificates.mapper.go                 |  6 +-
 lxd/db/certificates_test.go                   |  2 +-
 lxd/db/cluster/constants.go                   |  2 +-
 lxd/db/cluster/open.go                        | 14 ++--
 lxd/db/cluster/open_test.go                   |  8 +--
 lxd/db/cluster/query.go                       |  2 +-
 lxd/db/cluster/update.go                      | 10 +--
 lxd/db/cluster/update_test.go                 |  6 +-
 lxd/db/config.go                              |  2 +-
 lxd/db/config_test.go                         |  2 +-
 lxd/db/db.go                                  | 10 +--
 lxd/db/db_internal_test.go                    |  6 +-
 lxd/db/db_test.go                             |  4 +-
 lxd/db/images.go                              |  8 +--
 lxd/db/images.mapper.go                       |  6 +-
 lxd/db/images_test.go                         |  2 +-
 lxd/db/instances.go                           | 12 ++--
 lxd/db/instances.mapper.go                    |  6 +-
 lxd/db/instances_test.go                      |  8 +--
 lxd/db/legacy.go                              |  2 +-
 lxd/db/migration.go                           |  6 +-
 lxd/db/migration_test.go                      |  6 +-
 lxd/db/networks.go                            |  6 +-
 lxd/db/networks_test.go                       |  4 +-
 lxd/db/node.go                                | 12 ++--
 lxd/db/node/open.go                           |  6 +-
 lxd/db/node/open_test.go                      |  2 +-
 lxd/db/node/update.go                         | 10 +--
 lxd/db/node/update_test.go                    |  6 +-
 lxd/db/node_test.go                           |  8 +--
 lxd/db/operations.go                          |  2 +-
 lxd/db/operations_test.go                     |  2 +-
 lxd/db/patches.go                             |  2 +-
 lxd/db/profiles.go                            |  4 +-
 lxd/db/profiles.mapper.go                     |  6 +-
 lxd/db/projects.go                            |  6 +-
 lxd/db/projects.mapper.go                     |  6 +-
 lxd/db/projects_test.go                       |  2 +-
 lxd/db/query/config_test.go                   |  2 +-
 lxd/db/query/count_test.go                    |  2 +-
 lxd/db/query/dump_test.go                     |  2 +-
 lxd/db/query/objects_test.go                  |  2 +-
 lxd/db/query/retry.go                         |  2 +-
 lxd/db/query/slices_test.go                   |  4 +-
 lxd/db/query/transaction.go                   |  2 +-
 lxd/db/query/transaction_test.go              |  2 +-
 lxd/db/raft.go                                |  2 +-
 lxd/db/raft_test.go                           |  2 +-
 lxd/db/schema/query.go                        |  4 +-
 lxd/db/schema/schema.go                       |  4 +-
 lxd/db/schema/schema_test.go                  |  6 +-
 lxd/db/schema/update_test.go                  |  4 +-
 lxd/db/snapshots.go                           |  2 +-
 lxd/db/snapshots.mapper.go                    |  6 +-
 lxd/db/snapshots_test.go                      |  6 +-
 lxd/db/storage_pools.go                       |  6 +-
 lxd/db/storage_pools_export_test.go           |  2 +-
 lxd/db/storage_pools_test.go                  |  2 +-
 lxd/db/storage_volume_snapshots.go            |  2 +-
 lxd/db/storage_volumes.go                     |  6 +-
 lxd/db/storage_volumes_test.go                |  2 +-
 lxd/device/device_common.go                   | 12 ++--
 lxd/device/device_interface.go                |  8 +--
 lxd/device/device_load.go                     |  8 +--
 lxd/device/device_utils_disk.go               |  2 +-
 lxd/device/device_utils_generic.go            |  4 +-
 lxd/device/device_utils_infiniband.go         |  6 +-
 lxd/device/device_utils_inotify.go            | 10 +--
 lxd/device/device_utils_instance.go           |  8 +--
 lxd/device/device_utils_network.go            | 24 +++----
 lxd/device/device_utils_proxy.go              |  6 +-
 lxd/device/device_utils_unix.go               | 12 ++--
 lxd/device/device_utils_unix_events.go        | 12 ++--
 .../device_utils_unix_hotplug_events.go       | 10 +--
 lxd/device/device_utils_usb_events.go         | 10 +--
 lxd/device/disk.go                            | 34 ++++-----
 lxd/device/gpu.go                             | 12 ++--
 lxd/device/infiniband_physical.go             | 12 ++--
 lxd/device/infiniband_sriov.go                | 14 ++--
 lxd/device/nic.go                             |  2 +-
 lxd/device/nic_bridged.go                     | 34 ++++-----
 lxd/device/nic_ipvlan.go                      | 14 ++--
 lxd/device/nic_macvlan.go                     | 16 ++---
 lxd/device/nic_ovn.go                         | 26 +++----
 lxd/device/nic_p2p.go                         | 12 ++--
 lxd/device/nic_physical.go                    | 14 ++--
 lxd/device/nic_routed.go                      | 14 ++--
 lxd/device/nic_sriov.go                       | 18 ++---
 lxd/device/nictype/nictype.go                 |  6 +-
 lxd/device/none.go                            |  4 +-
 lxd/device/proxy.go                           | 22 +++---
 lxd/device/tpm.go                             | 16 ++---
 lxd/device/unix_common.go                     | 12 ++--
 lxd/device/unix_hotplug.go                    | 10 +--
 lxd/device/usb.go                             | 12 ++--
 lxd/devices.go                                | 22 +++---
 lxd/devlxd.go                                 | 20 +++---
 lxd/devlxd_test.go                            |  4 +-
 lxd/dnsmasq/dhcpalloc/dhcpalloc.go            | 10 +--
 lxd/dnsmasq/dnsmasq.go                        |  8 +--
 lxd/endpoints/cluster.go                      |  4 +-
 lxd/endpoints/devlxd_test.go                  |  2 +-
 lxd/endpoints/endpoints.go                    |  8 +--
 lxd/endpoints/endpoints_exported_test.go      |  4 +-
 lxd/endpoints/endpoints_test.go               | 10 +--
 lxd/endpoints/local_test.go                   |  2 +-
 lxd/endpoints/network.go                      |  6 +-
 lxd/endpoints/network_test.go                 |  2 +-
 lxd/endpoints/pprof.go                        |  4 +-
 lxd/endpoints/socket.go                       |  6 +-
 lxd/events.go                                 |  8 +--
 lxd/events/events.go                          |  6 +-
 lxd/events/logging.go                         |  4 +-
 lxd/filter/clause.go                          |  2 +-
 lxd/filter/clause_test.go                     |  2 +-
 lxd/filter/match_test.go                      |  4 +-
 lxd/filter/value_test.go                      |  4 +-
 lxd/firewall/drivers/drivers_nftables.go      |  8 +--
 lxd/firewall/drivers/drivers_xtables.go       | 10 +--
 lxd/firewall/firewall_interface.go            |  2 +-
 lxd/firewall/firewall_load.go                 |  4 +-
 lxd/images.go                                 | 44 ++++++------
 lxd/init.go                                   | 10 +--
 lxd/instance.go                               | 30 ++++----
 lxd/instance/drivers/driver_common.go         | 12 ++--
 lxd/instance/drivers/driver_lxc.go            | 68 +++++++++---------
 lxd/instance/drivers/driver_lxc_cmd.go        |  4 +-
 lxd/instance/drivers/driver_qemu.go           | 72 +++++++++----------
 lxd/instance/drivers/driver_qemu_cmd.go       |  6 +-
 lxd/instance/drivers/load.go                  | 16 ++---
 lxd/instance/drivers/qmp/monitor.go           |  2 +-
 lxd/instance/drivers/test_util.go             |  4 +-
 lxd/instance/filter.go                        |  4 +-
 lxd/instance/instance_interface.go            | 16 ++---
 lxd/instance/instance_utils.go                | 32 ++++-----
 lxd/instance/instancetype/instance_type.go    |  2 +-
 lxd/instance_backup.go                        | 18 ++---
 lxd/instance_console.go                       | 22 +++---
 lxd/instance_delete.go                        |  8 +--
 lxd/instance_exec.go                          | 28 ++++----
 lxd/instance_file.go                          |  6 +-
 lxd/instance_get.go                           |  4 +-
 lxd/instance_instance_types.go                | 18 ++---
 lxd/instance_logs.go                          | 10 +--
 lxd/instance_metadata.go                      | 10 +--
 lxd/instance_patch.go                         | 18 ++---
 lxd/instance_post.go                          | 26 +++----
 lxd/instance_put.go                           | 22 +++---
 lxd/instance_snapshot.go                      | 24 +++----
 lxd/instance_state.go                         | 14 ++--
 lxd/instance_test.go                          | 20 +++---
 lxd/instances.go                              | 14 ++--
 lxd/instances_get.go                          | 22 +++---
 lxd/instances_post.go                         | 32 ++++-----
 lxd/logging.go                                | 22 +++---
 lxd/maas/controller.go                        |  2 +-
 lxd/main.go                                   | 16 ++---
 lxd/main_activateifneeded.go                  | 16 ++---
 lxd/main_callhook.go                          |  2 +-
 lxd/main_checkfeature.go                      |  6 +-
 lxd/main_cluster.go                           | 14 ++--
 lxd/main_daemon.go                            |  4 +-
 lxd/main_forkdns.go                           | 10 +--
 lxd/main_forkexec.go                          |  2 +-
 lxd/main_forkmount.go                         |  2 +-
 lxd/main_forknet.go                           |  6 +-
 lxd/main_forkproxy.go                         | 12 ++--
 lxd/main_forkproxy_test.go                    |  4 +-
 lxd/main_forkstart.go                         |  2 +-
 lxd/main_forksyscall.go                       |  2 +-
 lxd/main_forkzfs.go                           |  2 +-
 lxd/main_import.go                            |  2 +-
 lxd/main_init.go                              | 14 ++--
 lxd/main_init_auto.go                         | 12 ++--
 lxd/main_init_dump.go                         |  6 +-
 lxd/main_init_interactive.go                  | 22 +++---
 lxd/main_init_preseed.go                      |  2 +-
 lxd/main_manpage.go                           |  2 +-
 lxd/main_migratedumpsuccess.go                |  4 +-
 lxd/main_netcat.go                            |  4 +-
 lxd/main_nsexec.go                            |  2 +-
 lxd/main_shutdown.go                          |  2 +-
 lxd/main_sql.go                               |  4 +-
 lxd/main_test.go                              | 10 +--
 lxd/main_version.go                           |  4 +-
 lxd/main_waitready.go                         |  4 +-
 lxd/migrate.go                                | 12 ++--
 lxd/migrate_instance.go                       | 26 +++----
 lxd/migrate_storage_volumes.go                | 16 ++---
 lxd/migration/migration_volumes.go            |  8 +--
 lxd/migration/wsproto.go                      |  2 +-
 lxd/network/driver_bridge.go                  | 32 ++++-----
 lxd/network/driver_common.go                  | 20 +++---
 lxd/network/driver_macvlan.go                 | 12 ++--
 lxd/network/driver_ovn.go                     | 26 +++----
 lxd/network/driver_physical.go                | 16 ++---
 lxd/network/driver_sriov.go                   | 12 ++--
 lxd/network/network_interface.go              | 10 +--
 lxd/network/network_load.go                   |  2 +-
 lxd/network/network_utils.go                  | 28 ++++----
 lxd/network/network_utils_bridge.go           |  4 +-
 lxd/network/openvswitch/ovn.go                |  2 +-
 lxd/network/openvswitch/ovs.go                |  2 +-
 lxd/networks.go                               | 34 ++++-----
 lxd/networks_utils.go                         | 16 ++---
 lxd/node/config.go                            |  6 +-
 lxd/node/config_test.go                       |  4 +-
 lxd/node/raft.go                              |  2 +-
 lxd/node/raft_test.go                         |  4 +-
 lxd/operations.go                             | 22 +++---
 lxd/operations/linux.go                       |  2 +-
 lxd/operations/notlinux.go                    |  2 +-
 lxd/operations/operations.go                  | 18 ++---
 lxd/operations/response.go                    |  8 +--
 lxd/operations/websocket.go                   |  4 +-
 lxd/patches.go                                | 32 ++++-----
 lxd/patches_utils.go                          | 10 +--
 lxd/profiles.go                               | 24 +++----
 lxd/profiles_utils.go                         | 14 ++--
 lxd/project/permissions.go                    | 12 ++--
 lxd/project/permissions_test.go               |  8 +--
 lxd/project/project.go                        |  6 +-
 lxd/project/project_test.go                   |  2 +-
 lxd/rbac/server.go                            |  4 +-
 lxd/resources.go                              |  8 +--
 lxd/resources/cpu.go                          |  2 +-
 lxd/resources/gpu.go                          |  2 +-
 lxd/resources/memory.go                       |  4 +-
 lxd/resources/network.go                      |  2 +-
 lxd/resources/network_ethtool.go              |  2 +-
 lxd/resources/pci.go                          |  2 +-
 lxd/resources/resources.go                    |  2 +-
 lxd/resources/storage.go                      |  2 +-
 lxd/resources/system.go                       |  2 +-
 lxd/resources/usb.go                          |  4 +-
 lxd/response.go                               |  6 +-
 lxd/response/response.go                      |  8 +--
 lxd/response/smart.go                         |  2 +-
 lxd/response/smart_linux.go                   |  2 +-
 lxd/revert/revert_test.go                     |  2 +-
 lxd/rsync/rsync.go                            |  8 +--
 lxd/seccomp/seccomp.go                        | 26 +++----
 lxd/state/notlinux.go                         |  2 +-
 lxd/state/state.go                            | 12 ++--
 lxd/state/testing.go                          |  6 +-
 lxd/storage.go                                | 18 ++---
 lxd/storage/backend_lxd.go                    | 38 +++++-----
 lxd/storage/backend_lxd_patches.go            | 14 ++--
 lxd/storage/backend_mock.go                   | 18 ++---
 lxd/storage/drivers/driver_btrfs.go           | 14 ++--
 lxd/storage/drivers/driver_btrfs_utils.go     |  8 +--
 lxd/storage/drivers/driver_btrfs_volumes.go   | 18 ++---
 lxd/storage/drivers/driver_ceph.go            | 16 ++---
 lxd/storage/drivers/driver_ceph_utils.go      | 10 +--
 lxd/storage/drivers/driver_ceph_volumes.go    | 22 +++---
 lxd/storage/drivers/driver_cephfs.go          | 10 +--
 lxd/storage/drivers/driver_cephfs_utils.go    |  2 +-
 lxd/storage/drivers/driver_cephfs_volumes.go  | 16 ++---
 lxd/storage/drivers/driver_common.go          | 10 +--
 lxd/storage/drivers/driver_dir.go             |  6 +-
 lxd/storage/drivers/driver_dir_utils.go       |  8 +--
 lxd/storage/drivers/driver_dir_volumes.go     | 18 ++---
 lxd/storage/drivers/driver_lvm.go             | 14 ++--
 lxd/storage/drivers/driver_lvm_patches.go     |  4 +-
 lxd/storage/drivers/driver_lvm_utils.go       | 14 ++--
 lxd/storage/drivers/driver_lvm_volumes.go     | 18 ++---
 lxd/storage/drivers/driver_zfs.go             | 16 ++---
 lxd/storage/drivers/driver_zfs_patches.go     |  2 +-
 lxd/storage/drivers/driver_zfs_utils.go       |  6 +-
 lxd/storage/drivers/driver_zfs_volumes.go     | 20 +++---
 lxd/storage/drivers/drivers_mock.go           | 10 +--
 lxd/storage/drivers/generic_vfs.go            | 22 +++---
 lxd/storage/drivers/interface.go              | 14 ++--
 lxd/storage/drivers/load.go                   |  4 +-
 lxd/storage/drivers/utils.go                  |  6 +-
 lxd/storage/drivers/utils_cgo.go              |  2 +-
 lxd/storage/drivers/volume.go                 | 12 ++--
 lxd/storage/load.go                           | 20 +++---
 lxd/storage/pool_interface.go                 | 14 ++--
 lxd/storage/quota/projectquota.go             |  2 +-
 lxd/storage/storage.go                        |  6 +-
 lxd/storage/utils.go                          | 38 +++++-----
 lxd/storage_migration.go                      | 10 +--
 lxd/storage_pools.go                          | 18 ++---
 lxd/storage_pools_config.go                   |  8 +--
 lxd/storage_pools_utils.go                    |  8 +--
 lxd/storage_volumes.go                        | 30 ++++----
 lxd/storage_volumes_backup.go                 | 20 +++---
 lxd/storage_volumes_snapshot.go               | 26 +++----
 lxd/storage_volumes_utils.go                  | 18 ++---
 lxd/sys/apparmor.go                           |  8 +--
 lxd/sys/os.go                                 | 12 ++--
 lxd/task/group_test.go                        |  2 +-
 lxd/task/task_test.go                         |  2 +-
 lxd/util/config.go                            |  2 +-
 lxd/util/config_test.go                       |  2 +-
 lxd/util/encryption.go                        |  2 +-
 lxd/util/fs.go                                |  2 +-
 lxd/util/http.go                              |  6 +-
 lxd/util/kernel.go                            |  2 +-
 lxd/util/net.go                               |  4 +-
 lxd/util/net_test.go                          |  2 +-
 lxd/util/sys.go                               |  8 +--
 lxd/vsock/vsock.go                            |  2 +-
 shared/archive_linux.go                       |  4 +-
 shared/cert_test.go                           |  2 +-
 shared/cmd/ask.go                             |  2 +-
 shared/eagain/file_unix.go                    |  2 +-
 shared/generate/db.go                         |  6 +-
 shared/generate/db/constants.go               |  6 +-
 shared/generate/db/lex.go                     |  2 +-
 shared/generate/db/mapping.go                 |  4 +-
 shared/generate/db/method.go                  |  4 +-
 shared/generate/db/parse.go                   |  6 +-
 shared/generate/db/parse_test.go              |  2 +-
 shared/generate/db/schema.go                  |  4 +-
 shared/generate/db/stmt.go                    |  4 +-
 shared/generate/lex/parse_test.go             |  4 +-
 shared/idmap/idmapset_linux.go                |  4 +-
 shared/idmap/shift_linux.go                   |  6 +-
 shared/instance.go                            |  4 +-
 shared/instancewriter/instance_tar_writer.go  |  6 +-
 shared/json.go                                |  2 +-
 shared/log15/handler.go                       |  2 +-
 shared/log15/root.go                          |  2 +-
 shared/logging/format.go                      |  2 +-
 shared/logging/log.go                         |  6 +-
 shared/logging/log_posix.go                   |  2 +-
 shared/logging/log_windows.go                 |  2 +-
 shared/logging/testing.go                     |  2 +-
 shared/netutils/network_linux.go              |  4 +-
 shared/netutils/network_linux_cgo.go          |  2 +-
 shared/network.go                             |  4 +-
 shared/osarch/architectures_linux.go          |  2 +-
 shared/osarch/tempfile_test.go                |  2 +-
 shared/simplestreams/products.go              |  6 +-
 shared/simplestreams/simplestreams.go         |  6 +-
 shared/simplestreams/sort.go                  |  4 +-
 shared/subprocess/proc.go                     |  2 +-
 shared/termios/termios_unix.go                |  2 +-
 shared/util.go                                |  6 +-
 shared/util_linux.go                          |  4 +-
 shared/util_linux_cgo.go                      |  2 +-
 shared/validate/validate.go                   |  2 +-
 shared/validate/validate_test.go              |  2 +-
 shared/version/platform_linux.go              |  4 +-
 shared/version/useragent.go                   |  2 +-
 515 files changed, 2251 insertions(+), 2251 deletions(-)

diff --git a/client/connection.go b/client/connection.go
index e006546429..2f77391555 100644
--- a/client/connection.go
+++ b/client/connection.go
@@ -12,9 +12,9 @@ import (
 
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/simplestreams"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/simplestreams"
 )
 
 // ConnectionArgs represents a set of common connection properties
diff --git a/client/events.go b/client/events.go
index b0361a5495..ded9902d06 100644
--- a/client/events.go
+++ b/client/events.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // The EventListener struct is used to interact with a LXD event stream
diff --git a/client/interfaces.go b/client/interfaces.go
index 85a84a73ee..531a4aa9d4 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
 )
 
 // The Operation type represents a currently running operation.
diff --git a/client/lxd.go b/client/lxd.go
index 220f7bc900..175e32ab56 100644
--- a/client/lxd.go
+++ b/client/lxd.go
@@ -13,9 +13,9 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 
 	neturl "net/url"
 )
diff --git a/client/lxd_certificates.go b/client/lxd_certificates.go
index 9825945285..e1196a907e 100644
--- a/client/lxd_certificates.go
+++ b/client/lxd_certificates.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Certificate handling functions
diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go
index f67940b64f..589c33cead 100644
--- a/client/lxd_cluster.go
+++ b/client/lxd_cluster.go
@@ -3,7 +3,7 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // GetCluster returns information about a cluster
diff --git a/client/lxd_containers.go b/client/lxd_containers.go
index 61fa5a3b8a..7a524c58c7 100644
--- a/client/lxd_containers.go
+++ b/client/lxd_containers.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Container handling functions
diff --git a/client/lxd_events.go b/client/lxd_events.go
index 1768316544..08f838695b 100644
--- a/client/lxd_events.go
+++ b/client/lxd_events.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Event handling functions
diff --git a/client/lxd_images.go b/client/lxd_images.go
index 05b20bbe5e..1e148ec926 100644
--- a/client/lxd_images.go
+++ b/client/lxd_images.go
@@ -12,11 +12,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Image handling functions
diff --git a/client/lxd_instances.go b/client/lxd_instances.go
index 0195d7504d..a7d6e85bca 100644
--- a/client/lxd_instances.go
+++ b/client/lxd_instances.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Instance handling functions.
diff --git a/client/lxd_networks.go b/client/lxd_networks.go
index a5cc8d723f..cbc5a247ab 100644
--- a/client/lxd_networks.go
+++ b/client/lxd_networks.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // GetNetworkNames returns a list of network names
diff --git a/client/lxd_operations.go b/client/lxd_operations.go
index 1452432e66..1ef13da1ae 100644
--- a/client/lxd_operations.go
+++ b/client/lxd_operations.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // GetOperationUUIDs returns a list of operation uuids
diff --git a/client/lxd_profiles.go b/client/lxd_profiles.go
index 8f6b48b937..18313866a0 100644
--- a/client/lxd_profiles.go
+++ b/client/lxd_profiles.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Profile handling functions
diff --git a/client/lxd_projects.go b/client/lxd_projects.go
index 369c94bd6f..bd80d25fcc 100644
--- a/client/lxd_projects.go
+++ b/client/lxd_projects.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Project handling functions
diff --git a/client/lxd_server.go b/client/lxd_server.go
index d3167066ba..3bd168679a 100644
--- a/client/lxd_server.go
+++ b/client/lxd_server.go
@@ -3,8 +3,8 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Server handling functions
diff --git a/client/lxd_storage_pools.go b/client/lxd_storage_pools.go
index bd1831ae65..8449f42501 100644
--- a/client/lxd_storage_pools.go
+++ b/client/lxd_storage_pools.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Storage pool handling functions
diff --git a/client/lxd_storage_volumes.go b/client/lxd_storage_volumes.go
index e12ba0c882..ceb85f91c6 100644
--- a/client/lxd_storage_volumes.go
+++ b/client/lxd_storage_volumes.go
@@ -7,10 +7,10 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Storage volumes handling function
diff --git a/client/operations.go b/client/operations.go
index e99145098f..3b35e9f885 100644
--- a/client/operations.go
+++ b/client/operations.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // The Operation type represents an ongoing LXD operation (asynchronous processing)
diff --git a/client/simplestreams.go b/client/simplestreams.go
index 205661d6e1..7a73bc3ac1 100644
--- a/client/simplestreams.go
+++ b/client/simplestreams.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/lxc/lxd/shared/simplestreams"
+	"github.com/grant-he/lxd/shared/simplestreams"
 )
 
 // ProtocolSimpleStreams implements a SimpleStreams API client
diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go
index d720f0321b..7716e8f21a 100644
--- a/client/simplestreams_images.go
+++ b/client/simplestreams_images.go
@@ -10,8 +10,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Image handling functions
diff --git a/client/util.go b/client/util.go
index 6c34f390f0..8b1b9c240c 100644
--- a/client/util.go
+++ b/client/util.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 func tlsHTTPClient(client *http.Client, tlsClientCert string, tlsClientKey string, tlsCA string, tlsServerCert string, insecureSkipVerify bool, proxy func(req *http.Request) (*url.URL, error)) (*http.Client, error) {
diff --git a/fuidshift/main.go b/fuidshift/main.go
index 4fc45d9d96..59f7b8db7a 100644
--- a/fuidshift/main.go
+++ b/fuidshift/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/fuidshift/main_shift.go b/fuidshift/main_shift.go
index 98fe525acd..8d4a0b311e 100644
--- a/fuidshift/main_shift.go
+++ b/fuidshift/main_shift.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/idmap"
 )
 
 type cmdShift struct {
diff --git a/lxc-to-lxd/config.go b/lxc-to-lxd/config.go
index ca256839ab..fef4dcab4e 100644
--- a/lxc-to-lxd/config.go
+++ b/lxc-to-lxd/config.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 var checkedKeys = []string{
diff --git a/lxc-to-lxd/main.go b/lxc-to-lxd/main.go
index a350214eda..be21d7cfe0 100644
--- a/lxc-to-lxd/main.go
+++ b/lxc-to-lxd/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxc-to-lxd/main_migrate.go b/lxc-to-lxd/main_migrate.go
index 7937b847f0..fc26a627a2 100644
--- a/lxc-to-lxd/main_migrate.go
+++ b/lxc-to-lxd/main_migrate.go
@@ -11,12 +11,12 @@ import (
 	"github.com/spf13/cobra"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/osarch"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 type cmdMigrate struct {
diff --git a/lxc-to-lxd/main_netcat.go b/lxc-to-lxd/main_netcat.go
index db21bed71a..20e33f7812 100644
--- a/lxc-to-lxd/main_netcat.go
+++ b/lxc-to-lxd/main_netcat.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/eagain"
+	"github.com/grant-he/lxd/shared/eagain"
 )
 
 type cmdNetcat struct {
diff --git a/lxc-to-lxd/transfer.go b/lxc-to-lxd/transfer.go
index abcae89bc4..3939f82531 100644
--- a/lxc-to-lxd/transfer.go
+++ b/lxc-to-lxd/transfer.go
@@ -12,9 +12,9 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Send an rsync stream of a path over a websocket
diff --git a/lxc-to-lxd/utils.go b/lxc-to-lxd/utils.go
index 5365549251..889e40bbb1 100644
--- a/lxc-to-lxd/utils.go
+++ b/lxc-to-lxd/utils.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/migration"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/migration"
 )
 
 func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error {
diff --git a/lxc/action.go b/lxc/action.go
index 292a82372a..30a7ef2904 100644
--- a/lxc/action.go
+++ b/lxc/action.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 // Start
diff --git a/lxc/alias.go b/lxc/alias.go
index e25e518aea..fcfb3c5f82 100644
--- a/lxc/alias.go
+++ b/lxc/alias.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/utils"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/utils"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdAlias struct {
diff --git a/lxc/cluster.go b/lxc/cluster.go
index 2844acc0fa..d9530c5de2 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -12,12 +12,12 @@ import (
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdCluster struct {
diff --git a/lxc/config.go b/lxc/config.go
index e0dd0fcac5..9ea8b77166 100644
--- a/lxc/config.go
+++ b/lxc/config.go
@@ -9,12 +9,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdConfig struct {
diff --git a/lxc/config/cert.go b/lxc/config/cert.go
index 42ccf8312a..88a688afcc 100644
--- a/lxc/config/cert.go
+++ b/lxc/config/cert.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // HasClientCertificate will return true if a client certificate has already been generated
diff --git a/lxc/config/file.go b/lxc/config/file.go
index ac58bec39e..86c4c76f82 100644
--- a/lxc/config/file.go
+++ b/lxc/config/file.go
@@ -8,7 +8,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // LoadConfig reads the configuration from the config path; if the path does
diff --git a/lxc/config/remote.go b/lxc/config/remote.go
index 40f64a9d9c..454db9ba08 100644
--- a/lxc/config/remote.go
+++ b/lxc/config/remote.go
@@ -15,8 +15,8 @@ import (
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery/form"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Remote holds details for communication with a remote daemon
diff --git a/lxc/config_device.go b/lxc/config_device.go
index d6dab2e83a..2b642da71f 100644
--- a/lxc/config_device.go
+++ b/lxc/config_device.go
@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdConfigDevice struct {
diff --git a/lxc/config_metadata.go b/lxc/config_metadata.go
index f99cc9f940..1d12ff21ae 100644
--- a/lxc/config_metadata.go
+++ b/lxc/config_metadata.go
@@ -8,11 +8,11 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdConfigMetadata struct {
diff --git a/lxc/config_template.go b/lxc/config_template.go
index 8e7ce7daa7..0533dfb038 100644
--- a/lxc/config_template.go
+++ b/lxc/config_template.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdConfigTemplate struct {
diff --git a/lxc/config_trust.go b/lxc/config_trust.go
index bd95a9bc40..40fc5e6b2d 100644
--- a/lxc/config_trust.go
+++ b/lxc/config_trust.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdConfigTrust struct {
diff --git a/lxc/console.go b/lxc/console.go
index 907c39976c..a48a6f2008 100644
--- a/lxc/console.go
+++ b/lxc/console.go
@@ -13,13 +13,13 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdConsole struct {
diff --git a/lxc/console_unix.go b/lxc/console_unix.go
index 44c7ee672d..050be5e8e3 100644
--- a/lxc/console_unix.go
+++ b/lxc/console_unix.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func (c *cmdConsole) controlSocketHandler(control *websocket.Conn) {
diff --git a/lxc/copy.go b/lxc/copy.go
index 7b88270ee4..517e7a78ba 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdCopy struct {
diff --git a/lxc/delete.go b/lxc/delete.go
index 5aad5dfe4c..cbde4405cc 100644
--- a/lxc/delete.go
+++ b/lxc/delete.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdDelete struct {
diff --git a/lxc/exec.go b/lxc/exec.go
index 5d1db23c37..0d709ffa0d 100644
--- a/lxc/exec.go
+++ b/lxc/exec.go
@@ -12,12 +12,12 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdExec struct {
diff --git a/lxc/exec_unix.go b/lxc/exec_unix.go
index 91b62ad209..d370c46234 100644
--- a/lxc/exec_unix.go
+++ b/lxc/exec_unix.go
@@ -9,8 +9,8 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func (c *cmdExec) getTERM() (string, bool) {
diff --git a/lxc/exec_windows.go b/lxc/exec_windows.go
index af87dc7a3d..d3a087f429 100644
--- a/lxc/exec_windows.go
+++ b/lxc/exec_windows.go
@@ -10,8 +10,8 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/windows"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Windows doesn't process ANSI sequences natively, so we wrap
diff --git a/lxc/export.go b/lxc/export.go
index d670a194fc..ccba1847bd 100644
--- a/lxc/export.go
+++ b/lxc/export.go
@@ -9,12 +9,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdExport struct {
diff --git a/lxc/file.go b/lxc/file.go
index dda9cc749b..9527e1dd5a 100644
--- a/lxc/file.go
+++ b/lxc/file.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/termios"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type cmdFile struct {
diff --git a/lxc/image.go b/lxc/image.go
index 1d1900174f..7138eced2f 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -13,13 +13,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type imageColumn struct {
diff --git a/lxc/image_alias.go b/lxc/image_alias.go
index b7e941b84e..ecb1dafca9 100644
--- a/lxc/image_alias.go
+++ b/lxc/image_alias.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdImageAlias struct {
diff --git a/lxc/import.go b/lxc/import.go
index 0671b50f76..ff209fd511 100644
--- a/lxc/import.go
+++ b/lxc/import.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type cmdImport struct {
diff --git a/lxc/info.go b/lxc/info.go
index b1be66ff43..a5c38a32b2 100644
--- a/lxc/info.go
+++ b/lxc/info.go
@@ -9,13 +9,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type cmdInfo struct {
diff --git a/lxc/init.go b/lxc/init.go
index 96a005b85a..cafb532914 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -9,13 +9,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdInit struct {
diff --git a/lxc/launch.go b/lxc/launch.go
index 052f9c9c10..631a2c8a78 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdLaunch struct {
diff --git a/lxc/list.go b/lxc/list.go
index e5aea95301..3297140276 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/spf13/cobra"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/units"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type column struct {
diff --git a/lxc/list_test.go b/lxc/list_test.go
index 5bb084e044..7fadb646b8 100644
--- a/lxc/list_test.go
+++ b/lxc/list_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func TestDotPrefixMatch(t *testing.T) {
diff --git a/lxc/main.go b/lxc/main.go
index 902c0ecea5..05858450c9 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/shared"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/shared"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxc/main_aliases.go b/lxc/main_aliases.go
index fd37122339..1f3a216541 100644
--- a/lxc/main_aliases.go
+++ b/lxc/main_aliases.go
@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 // defaultAliases contains LXC's built-in command line aliases.  The built-in
diff --git a/lxc/main_test.go b/lxc/main_test.go
index 9165bc26a3..b3c4eba2c4 100644
--- a/lxc/main_test.go
+++ b/lxc/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxc/config"
+	"github.com/grant-he/lxd/lxc/config"
 )
 
 type aliasTestcase struct {
diff --git a/lxc/manpage.go b/lxc/manpage.go
index f7f065832b..c3c7f9a0ea 100644
--- a/lxc/manpage.go
+++ b/lxc/manpage.go
@@ -4,9 +4,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	"github.com/lxc/lxd/shared"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdManpage struct {
diff --git a/lxc/monitor.go b/lxc/monitor.go
index b777e8a57d..989d86563d 100644
--- a/lxc/monitor.go
+++ b/lxc/monitor.go
@@ -7,12 +7,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 type cmdMonitor struct {
diff --git a/lxc/move.go b/lxc/move.go
index f77bf6f222..6cc2aa3be7 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxc/network.go b/lxc/network.go
index 41c2f6e549..a7d4d970a5 100644
--- a/lxc/network.go
+++ b/lxc/network.go
@@ -10,13 +10,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type cmdNetwork struct {
diff --git a/lxc/operation.go b/lxc/operation.go
index 1f2965e7e6..324e828db7 100644
--- a/lxc/operation.go
+++ b/lxc/operation.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxc/utils"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/lxc/utils"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdOperation struct {
diff --git a/lxc/profile.go b/lxc/profile.go
index 7bf56518b7..be4855b8fb 100644
--- a/lxc/profile.go
+++ b/lxc/profile.go
@@ -10,12 +10,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdProfile struct {
diff --git a/lxc/project.go b/lxc/project.go
index 194ad0c52e..0331c84146 100644
--- a/lxc/project.go
+++ b/lxc/project.go
@@ -10,12 +10,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type cmdProject struct {
diff --git a/lxc/publish.go b/lxc/publish.go
index ff1e3575b4..36ffd3a3e4 100644
--- a/lxc/publish.go
+++ b/lxc/publish.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 type cmdPublish struct {
diff --git a/lxc/query.go b/lxc/query.go
index 29e58de88a..95340c39d6 100644
--- a/lxc/query.go
+++ b/lxc/query.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdQuery struct {
diff --git a/lxc/remote.go b/lxc/remote.go
index aa34772bc4..b10d68dcf5 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -13,13 +13,13 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdRemote struct {
diff --git a/lxc/rename.go b/lxc/rename.go
index 603c305725..dc255a50b3 100644
--- a/lxc/rename.go
+++ b/lxc/rename.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdRename struct {
diff --git a/lxc/restore.go b/lxc/restore.go
index b40440edeb..51165d4154 100644
--- a/lxc/restore.go
+++ b/lxc/restore.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 type cmdRestore struct {
diff --git a/lxc/snapshot.go b/lxc/snapshot.go
index f49e9a8ded..45a0d86080 100644
--- a/lxc/snapshot.go
+++ b/lxc/snapshot.go
@@ -3,10 +3,10 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
 
 	"fmt"
 	"strings"
diff --git a/lxc/storage.go b/lxc/storage.go
index c7d881d7d4..ca2a8cef71 100644
--- a/lxc/storage.go
+++ b/lxc/storage.go
@@ -11,13 +11,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type cmdStorage struct {
diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go
index e8a3335601..ff0028a78b 100644
--- a/lxc/storage_volume.go
+++ b/lxc/storage_volume.go
@@ -14,15 +14,15 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/termios"
-	"github.com/lxc/lxd/shared/units"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 type cmdStorageVolume struct {
diff --git a/lxc/utils.go b/lxc/utils.go
index a5e5091c51..ba32ca1d3d 100644
--- a/lxc/utils.go
+++ b/lxc/utils.go
@@ -10,10 +10,10 @@ import (
 	"github.com/fvbommel/sortorder"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/termios"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type stringList [][]string
diff --git a/lxc/utils/cancel.go b/lxc/utils/cancel.go
index 0b0a684288..42d0105ced 100644
--- a/lxc/utils/cancel.go
+++ b/lxc/utils/cancel.go
@@ -6,8 +6,8 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/i18n"
 )
 
 // CancelableWait waits for an operation and cancel it on SIGINT/SIGTERM
diff --git a/lxc/utils/progress.go b/lxc/utils/progress.go
index 1a548d7539..7f5827dbc8 100644
--- a/lxc/utils/progress.go
+++ b/lxc/utils/progress.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 // ProgressRenderer tracks the progress information
diff --git a/lxc/utils/table.go b/lxc/utils/table.go
index 4cf9ae50c3..c91c78c45c 100644
--- a/lxc/utils/table.go
+++ b/lxc/utils/table.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/lxc/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/i18n"
 	"github.com/olekukonko/tablewriter"
 	"gopkg.in/yaml.v2"
 )
diff --git a/lxc/utils_test.go b/lxc/utils_test.go
index f8ad029e73..85123716ae 100644
--- a/lxc/utils_test.go
+++ b/lxc/utils_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type utilsTestSuite struct {
diff --git a/lxc/version.go b/lxc/version.go
index ff562247cc..7acc533f7e 100644
--- a/lxc/version.go
+++ b/lxc/version.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/i18n"
-	"github.com/lxc/lxd/shared/version"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdVersion struct {
diff --git a/lxd-agent/api.go b/lxd-agent/api.go
index 33ed7d9722..244a6bb1da 100644
--- a/lxd-agent/api.go
+++ b/lxd-agent/api.go
@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/lxc/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/response"
 )
 
 // APIEndpoint represents a URL in our API.
diff --git a/lxd-agent/api_1.0.go b/lxd-agent/api_1.0.go
index ccae95060f..a8460855e2 100644
--- a/lxd-agent/api_1.0.go
+++ b/lxd-agent/api_1.0.go
@@ -4,10 +4,10 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/lxc/lxd/lxd/response"
-	lxdshared "github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/response"
+	lxdshared "github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var api10Cmd = APIEndpoint{
diff --git a/lxd-agent/daemon.go b/lxd-agent/daemon.go
index 9b4844a800..e9a39e8ba3 100644
--- a/lxd-agent/daemon.go
+++ b/lxd-agent/daemon.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/lxc/lxd/lxd/events"
+	"github.com/grant-he/lxd/lxd/events"
 )
 
 // A Daemon can respond to requests from a shared client.
diff --git a/lxd-agent/devlxd.go b/lxd-agent/devlxd.go
index c96a17b0fb..79d074513e 100644
--- a/lxd-agent/devlxd.go
+++ b/lxd-agent/devlxd.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // DevLxdServer creates an http.Server capable of handling requests against the
diff --git a/lxd-agent/events.go b/lxd-agent/events.go
index cd2b1cbacd..b23e65c50f 100644
--- a/lxd-agent/events.go
+++ b/lxd-agent/events.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var eventsCmd = APIEndpoint{
diff --git a/lxd-agent/exec.go b/lxd-agent/exec.go
index 35310ffef2..38bc0dc511 100644
--- a/lxd-agent/exec.go
+++ b/lxd-agent/exec.go
@@ -14,13 +14,13 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/netutils"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/netutils"
 )
 
 var execCmd = APIEndpoint{
diff --git a/lxd-agent/file.go b/lxd-agent/file.go
index 19a5cd00e1..2c8020dd33 100644
--- a/lxd-agent/file.go
+++ b/lxd-agent/file.go
@@ -10,8 +10,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
 )
 
 var fileCmd = APIEndpoint{
diff --git a/lxd-agent/main.go b/lxd-agent/main.go
index be4cfeefa3..614260d54c 100644
--- a/lxd-agent/main.go
+++ b/lxd-agent/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxd-agent/main_agent.go b/lxd-agent/main_agent.go
index 4d826813aa..341dd94d32 100644
--- a/lxd-agent/main_agent.go
+++ b/lxd-agent/main_agent.go
@@ -16,12 +16,12 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/lxd/vsock"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/lxd/vsock"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 type cmdAgent struct {
diff --git a/lxd-agent/network.go b/lxd-agent/network.go
index e018493764..82121882bd 100644
--- a/lxd-agent/network.go
+++ b/lxd-agent/network.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 // A variation of the standard tls.Listener that supports atomically swapping
diff --git a/lxd-agent/operations.go b/lxd-agent/operations.go
index 3c8f033f13..fcff00ca32 100644
--- a/lxd-agent/operations.go
+++ b/lxd-agent/operations.go
@@ -8,11 +8,11 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var operationCmd = APIEndpoint{
diff --git a/lxd-agent/server.go b/lxd-agent/server.go
index 4f7b9e1505..2c3b1929d2 100644
--- a/lxd-agent/server.go
+++ b/lxd-agent/server.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func restServer(tlsConfig *tls.Config, cert *x509.Certificate, debug bool, d *Daemon) *http.Server {
diff --git a/lxd-agent/state.go b/lxd-agent/state.go
index ff8292e720..9ffbc18e73 100644
--- a/lxd-agent/state.go
+++ b/lxd-agent/state.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var stateCmd = APIEndpoint{
diff --git a/lxd-agent/templates.go b/lxd-agent/templates.go
index 8e49788a4d..a3fc7cd647 100644
--- a/lxd-agent/templates.go
+++ b/lxd-agent/templates.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func templatesApply(path string) ([]string, error) {
diff --git a/lxd-benchmark/benchmark/benchmark.go b/lxd-benchmark/benchmark/benchmark.go
index 2d96f6fdb8..eff37455b2 100644
--- a/lxd-benchmark/benchmark/benchmark.go
+++ b/lxd-benchmark/benchmark/benchmark.go
@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/config"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/config"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 const userConfigKey = "user.lxd-benchmark"
diff --git a/lxd-benchmark/benchmark/operation.go b/lxd-benchmark/benchmark/operation.go
index b4f4f3cea7..6b7f0435ff 100644
--- a/lxd-benchmark/benchmark/operation.go
+++ b/lxd-benchmark/benchmark/operation.go
@@ -1,8 +1,8 @@
 package benchmark
 
 import (
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func createContainer(c lxd.ContainerServer, fingerprint string, name string, privileged bool) error {
diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go
index dcaca97787..04a33a8ff4 100644
--- a/lxd-benchmark/main.go
+++ b/lxd-benchmark/main.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd-benchmark/benchmark"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxd-benchmark/main_delete.go b/lxd-benchmark/main_delete.go
index c9c12f1772..d0d8ef15da 100644
--- a/lxd-benchmark/main_delete.go
+++ b/lxd-benchmark/main_delete.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxd-benchmark/benchmark"
+	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdDelete struct {
diff --git a/lxd-benchmark/main_init.go b/lxd-benchmark/main_init.go
index 7e2068b71d..c29fa3536f 100644
--- a/lxd-benchmark/main_init.go
+++ b/lxd-benchmark/main_init.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxd-benchmark/benchmark"
+	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdInit struct {
diff --git a/lxd-benchmark/main_launch.go b/lxd-benchmark/main_launch.go
index 1753879279..20fcd8e5ab 100644
--- a/lxd-benchmark/main_launch.go
+++ b/lxd-benchmark/main_launch.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxd-benchmark/benchmark"
+	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdLaunch struct {
diff --git a/lxd-benchmark/main_start.go b/lxd-benchmark/main_start.go
index c1cc0e3d58..0d98e7f986 100644
--- a/lxd-benchmark/main_start.go
+++ b/lxd-benchmark/main_start.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxd-benchmark/benchmark"
+	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdStart struct {
diff --git a/lxd-benchmark/main_stop.go b/lxd-benchmark/main_stop.go
index 056e0e179c..b2031bb476 100644
--- a/lxd-benchmark/main_stop.go
+++ b/lxd-benchmark/main_stop.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxd-benchmark/benchmark"
+	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdStop struct {
diff --git a/lxd-p2c/main.go b/lxd-p2c/main.go
index a350214eda..be21d7cfe0 100644
--- a/lxd-p2c/main.go
+++ b/lxd-p2c/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxd-p2c/main_migrate.go b/lxd-p2c/main_migrate.go
index 4c934d5ca8..325172fce7 100644
--- a/lxd-p2c/main_migrate.go
+++ b/lxd-p2c/main_migrate.go
@@ -13,9 +13,9 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 type cmdMigrate struct {
diff --git a/lxd-p2c/main_netcat.go b/lxd-p2c/main_netcat.go
index db21bed71a..20e33f7812 100644
--- a/lxd-p2c/main_netcat.go
+++ b/lxd-p2c/main_netcat.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/eagain"
+	"github.com/grant-he/lxd/shared/eagain"
 )
 
 type cmdNetcat struct {
diff --git a/lxd-p2c/transfer.go b/lxd-p2c/transfer.go
index 329c2754f4..5b3f862a2f 100644
--- a/lxd-p2c/transfer.go
+++ b/lxd-p2c/transfer.go
@@ -12,9 +12,9 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Send an rsync stream of a path over a websocket
diff --git a/lxd-p2c/utils.go b/lxd-p2c/utils.go
index f5c2afe47f..2f42216085 100644
--- a/lxd-p2c/utils.go
+++ b/lxd-p2c/utils.go
@@ -10,11 +10,11 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error {
diff --git a/lxd/api.go b/lxd/api.go
index 2bdcba49d2..0f9f5409d2 100644
--- a/lxd/api.go
+++ b/lxd/api.go
@@ -5,14 +5,14 @@ import (
 	"net/url"
 	"strings"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 
 	"github.com/gorilla/mux"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // RestServer creates an http.Server capable of handling requests against the LXD REST API endpoint.
diff --git a/lxd/api_1.0.go b/lxd/api_1.0.go
index 72212579a2..c07b467944 100644
--- a/lxd/api_1.0.go
+++ b/lxd/api_1.0.go
@@ -8,19 +8,19 @@ import (
 
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/config"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index 7e88bcce2f..2fb68d872d 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -14,20 +14,20 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var clusterCmd = APIEndpoint{
diff --git a/lxd/api_cluster_test.go b/lxd/api_cluster_test.go
index fa280460dd..f3395857ab 100644
--- a/lxd/api_cluster_test.go
+++ b/lxd/api_cluster_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/api_internal.go b/lxd/api_internal.go
index b7bb74b6e2..97f2b2904c 100644
--- a/lxd/api_internal.go
+++ b/lxd/api_internal.go
@@ -15,24 +15,24 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/node"
-	"github.com/lxc/lxd/lxd/db/query"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/node"
+	"github.com/grant-he/lxd/lxd/db/query"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 var apiInternal = []APIEndpoint{
diff --git a/lxd/api_networks_test.go b/lxd/api_networks_test.go
index 4b71c4139b..5671d09139 100644
--- a/lxd/api_networks_test.go
+++ b/lxd/api_networks_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/api_project.go b/lxd/api_project.go
index 85de1f61b2..3adc107cae 100644
--- a/lxd/api_project.go
+++ b/lxd/api_project.go
@@ -12,18 +12,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	projecthelpers "github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/validate"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	projecthelpers "github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // projectFeatures are the features available to projects.
diff --git a/lxd/api_storage_pools_test.go b/lxd/api_storage_pools_test.go
index 0e291a7be2..fb545c96e0 100644
--- a/lxd/api_storage_pools_test.go
+++ b/lxd/api_storage_pools_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/apparmor/apparmor.go b/lxd/apparmor/apparmor.go
index 9d8ec55f46..7da3bd11cc 100644
--- a/lxd/apparmor/apparmor.go
+++ b/lxd/apparmor/apparmor.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 const (
diff --git a/lxd/apparmor/instance.go b/lxd/apparmor/instance.go
index 6fd1a2a11e..45044c7654 100644
--- a/lxd/apparmor/instance.go
+++ b/lxd/apparmor/instance.go
@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Internal copy of the instance interface.
diff --git a/lxd/apparmor/instance_forkproxy.go b/lxd/apparmor/instance_forkproxy.go
index 5518e53b2d..b93929958a 100644
--- a/lxd/apparmor/instance_forkproxy.go
+++ b/lxd/apparmor/instance_forkproxy.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"text/template"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Internal copy of the device interface.
diff --git a/lxd/apparmor/network.go b/lxd/apparmor/network.go
index e5b2698c79..c153e58836 100644
--- a/lxd/apparmor/network.go
+++ b/lxd/apparmor/network.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/lxc/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/state"
 )
 
 // Internal copy of the network interface.
diff --git a/lxd/apparmor/network_dnsmasq.go b/lxd/apparmor/network_dnsmasq.go
index bedf098395..8993a2b672 100644
--- a/lxd/apparmor/network_dnsmasq.go
+++ b/lxd/apparmor/network_dnsmasq.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
 )
 
 var dnsmasqProfileTpl = template.Must(template.New("dnsmasqProfile").Parse(`#include <tunables/global>
diff --git a/lxd/apparmor/network_forkdns.go b/lxd/apparmor/network_forkdns.go
index bc5dfecfc9..ee5dfdeefd 100644
--- a/lxd/apparmor/network_forkdns.go
+++ b/lxd/apparmor/network_forkdns.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 var forkdnsProfileTpl = template.Must(template.New("forkdnsProfile").Parse(`#include <tunables/global>
diff --git a/lxd/backup.go b/lxd/backup.go
index 23c94064b8..3a74d60c9d 100644
--- a/lxd/backup.go
+++ b/lxd/backup.go
@@ -12,25 +12,25 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/instancewriter"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 // Create a new backup.
diff --git a/lxd/backup/backup_common.go b/lxd/backup/backup_common.go
index 6b298bcdd2..80431b3174 100644
--- a/lxd/backup/backup_common.go
+++ b/lxd/backup/backup_common.go
@@ -3,7 +3,7 @@ package backup
 import (
 	"time"
 
-	"github.com/lxc/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/state"
 )
 
 // WorkingDirPrefix is used when temporary working directories are needed.
diff --git a/lxd/backup/backup_config.go b/lxd/backup/backup_config.go
index cb25b27bd6..9ac9d4b75d 100644
--- a/lxd/backup/backup_config.go
+++ b/lxd/backup/backup_config.go
@@ -8,9 +8,9 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Config represents the config of a backup that can be stored in a backup.yaml file (or embedded in index.yaml).
diff --git a/lxd/backup/backup_info.go b/lxd/backup/backup_info.go
index 817f87e52c..98d5f6b268 100644
--- a/lxd/backup/backup_info.go
+++ b/lxd/backup/backup_info.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Type indicates the type of backup.
diff --git a/lxd/backup/backup_instance.go b/lxd/backup/backup_instance.go
index 9dd6c60876..09a6d3de52 100644
--- a/lxd/backup/backup_instance.go
+++ b/lxd/backup/backup_instance.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Instance represents the backup relevant subset of a LXD instance.
diff --git a/lxd/backup/backup_utils.go b/lxd/backup/backup_utils.go
index 08dc35918c..fc8ca75d15 100644
--- a/lxd/backup/backup_utils.go
+++ b/lxd/backup/backup_utils.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // TarReader rewinds backup file handle r and returns new tar reader and process cleanup function.
diff --git a/lxd/backup/backup_volume.go b/lxd/backup/backup_volume.go
index 2705e61e56..85f533d2cb 100644
--- a/lxd/backup/backup_volume.go
+++ b/lxd/backup/backup_volume.go
@@ -5,11 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // VolumeBackup represents a custom volume backup.
diff --git a/lxd/certificates.go b/lxd/certificates.go
index 673ae5a386..b1cd3a8711 100644
--- a/lxd/certificates.go
+++ b/lxd/certificates.go
@@ -12,17 +12,17 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
-
-	log "github.com/lxc/lxd/shared/log15"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
+
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 var certificatesCmd = APIEndpoint{
diff --git a/lxd/cgroup/abstraction.go b/lxd/cgroup/abstraction.go
index c57ae2e3bc..0a9b942435 100644
--- a/lxd/cgroup/abstraction.go
+++ b/lxd/cgroup/abstraction.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // CGroup represents the main cgroup abstraction.
diff --git a/lxd/cgroup/file.go b/lxd/cgroup/file.go
index 7ad0679624..410d4c630a 100644
--- a/lxd/cgroup/file.go
+++ b/lxd/cgroup/file.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // NewFileReadWriter returns a CGroup instance using the filesystem as its backend.
diff --git a/lxd/cgroup/init.go b/lxd/cgroup/init.go
index 1c8ff688d2..fb4dd93964 100644
--- a/lxd/cgroup/init.go
+++ b/lxd/cgroup/init.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var cgControllers = map[string]Backend{}
diff --git a/lxd/cluster/config.go b/lxd/cluster/config.go
index 548911cc30..cbf91c8773 100644
--- a/lxd/cluster/config.go
+++ b/lxd/cluster/config.go
@@ -13,8 +13,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/scrypt"
 
-	"github.com/lxc/lxd/lxd/config"
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 // Config holds cluster-wide configuration values.
diff --git a/lxd/cluster/config_test.go b/lxd/cluster/config_test.go
index 4b2ab5e42a..d5ec7e74cd 100644
--- a/lxd/cluster/config_test.go
+++ b/lxd/cluster/config_test.go
@@ -3,8 +3,8 @@ package cluster_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/connect.go b/lxd/cluster/connect.go
index 3667dfe56d..6fd4fbfbd6 100644
--- a/lxd/cluster/connect.go
+++ b/lxd/cluster/connect.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // UserAgentNotifier used to distinguish between a regular client request and an internal cluster request when
diff --git a/lxd/cluster/events.go b/lxd/cluster/events.go
index 2949be8de9..22b2b23987 100644
--- a/lxd/cluster/events.go
+++ b/lxd/cluster/events.go
@@ -5,13 +5,13 @@ import (
 	"sync"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/endpoints"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/endpoints"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var listeners = map[string]*lxd.EventListener{}
diff --git a/lxd/cluster/gateway.go b/lxd/cluster/gateway.go
index b57db673c5..1879bffab4 100644
--- a/lxd/cluster/gateway.go
+++ b/lxd/cluster/gateway.go
@@ -21,10 +21,10 @@ import (
 
 	dqlite "github.com/canonical/go-dqlite"
 	client "github.com/canonical/go-dqlite/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/gateway_export_test.go b/lxd/cluster/gateway_export_test.go
index 2ee96d5bc1..3daa1dee5b 100644
--- a/lxd/cluster/gateway_export_test.go
+++ b/lxd/cluster/gateway_export_test.go
@@ -1,8 +1,8 @@
 package cluster
 
 import (
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
 )
 
 // IsLeader returns true if this node is the leader.
diff --git a/lxd/cluster/gateway_test.go b/lxd/cluster/gateway_test.go
index ce782928af..43d6f434cf 100644
--- a/lxd/cluster/gateway_test.go
+++ b/lxd/cluster/gateway_test.go
@@ -12,10 +12,10 @@ import (
 	"testing"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/heartbeat.go b/lxd/cluster/heartbeat.go
index 41ad468712..dfe3c517f3 100644
--- a/lxd/cluster/heartbeat.go
+++ b/lxd/cluster/heartbeat.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/heartbeat_test.go b/lxd/cluster/heartbeat_test.go
index e322f69fb0..7e9bb58dde 100644
--- a/lxd/cluster/heartbeat_test.go
+++ b/lxd/cluster/heartbeat_test.go
@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/info.go b/lxd/cluster/info.go
index ee226691ab..e16dd30648 100644
--- a/lxd/cluster/info.go
+++ b/lxd/cluster/info.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index c0618b7244..44ec8922a4 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -9,17 +9,17 @@ import (
 
 	"github.com/canonical/go-dqlite/app"
 	"github.com/canonical/go-dqlite/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go
index 1a66266ffe..f8af188e0f 100644
--- a/lxd/cluster/membership_test.go
+++ b/lxd/cluster/membership_test.go
@@ -13,13 +13,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 func TestBootstrap_UnmetPreconditions(t *testing.T) {
diff --git a/lxd/cluster/migrate.go b/lxd/cluster/migrate.go
index 91d3d2ad83..0f70c79c6e 100644
--- a/lxd/cluster/migrate.go
+++ b/lxd/cluster/migrate.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/go-msgpack/codec"
-	"github.com/lxc/lxd/lxd/cluster/raft"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/cluster/raft"
+	"github.com/grant-he/lxd/shared"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 )
diff --git a/lxd/cluster/migrate_test.go b/lxd/cluster/migrate_test.go
index 4f1bd88d2f..0e1319a2aa 100644
--- a/lxd/cluster/migrate_test.go
+++ b/lxd/cluster/migrate_test.go
@@ -9,8 +9,8 @@ import (
 
 	dqlite "github.com/canonical/go-dqlite"
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/notify.go b/lxd/cluster/notify.go
index 28f5b44dff..f00ad9daed 100644
--- a/lxd/cluster/notify.go
+++ b/lxd/cluster/notify.go
@@ -6,12 +6,12 @@ import (
 	"sync"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/notify_test.go b/lxd/cluster/notify_test.go
index 4e19477d56..d038175d42 100644
--- a/lxd/cluster/notify_test.go
+++ b/lxd/cluster/notify_test.go
@@ -7,14 +7,14 @@ import (
 	"testing"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/raft_test.go b/lxd/cluster/raft_test.go
index 8bc9ee9fcf..3f34cf6c95 100644
--- a/lxd/cluster/raft_test.go
+++ b/lxd/cluster/raft_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/canonical/go-dqlite/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/lxd/cluster/recover.go b/lxd/cluster/recover.go
index d14f390622..841dfc6583 100644
--- a/lxd/cluster/recover.go
+++ b/lxd/cluster/recover.go
@@ -8,8 +8,8 @@ import (
 
 	dqlite "github.com/canonical/go-dqlite"
 	client "github.com/canonical/go-dqlite/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/resolve.go b/lxd/cluster/resolve.go
index 084fa9db24..9200a8ccee 100644
--- a/lxd/cluster/resolve.go
+++ b/lxd/cluster/resolve.go
@@ -3,7 +3,7 @@ package cluster
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 // ResolveTarget is a convenience for handling the value ?targetNode query
diff --git a/lxd/cluster/tls.go b/lxd/cluster/tls.go
index 5a409a9d41..dc2664877f 100644
--- a/lxd/cluster/tls.go
+++ b/lxd/cluster/tls.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Return a TLS configuration suitable for establishing inter-node network
diff --git a/lxd/cluster/upgrade.go b/lxd/cluster/upgrade.go
index 860fbda234..fff8e1b830 100644
--- a/lxd/cluster/upgrade.go
+++ b/lxd/cluster/upgrade.go
@@ -8,12 +8,12 @@ import (
 	"os"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/upgrade_test.go b/lxd/cluster/upgrade_test.go
index 72f2c538b4..d1c4c44893 100644
--- a/lxd/cluster/upgrade_test.go
+++ b/lxd/cluster/upgrade_test.go
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/config/map.go b/lxd/config/map.go
index a4e949269b..bbc8711a91 100644
--- a/lxd/config/map.go
+++ b/lxd/config/map.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Map is a structured map of config keys to config values.
diff --git a/lxd/config/map_test.go b/lxd/config/map_test.go
index 0c4934d70e..670e5a2d4b 100644
--- a/lxd/config/map_test.go
+++ b/lxd/config/map_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/config"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/config/safe.go b/lxd/config/safe.go
index 92da5a9007..a716ec0325 100644
--- a/lxd/config/safe.go
+++ b/lxd/config/safe.go
@@ -3,9 +3,9 @@ package config
 import (
 	"fmt"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // SafeLoad is a wrapper around Load() that does not error when invalid keys
diff --git a/lxd/config/safe_test.go b/lxd/config/safe_test.go
index 92c79c6d67..158e763d17 100644
--- a/lxd/config/safe_test.go
+++ b/lxd/config/safe_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/config"
 )
 
 // If the givne values contain invalid keys, they are ignored.
diff --git a/lxd/config/schema.go b/lxd/config/schema.go
index a1bbc3edad..5aba8910d7 100644
--- a/lxd/config/schema.go
+++ b/lxd/config/schema.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Schema defines the available keys of a config Map, along with the types
diff --git a/lxd/config/schema_test.go b/lxd/config/schema_test.go
index b9a62760c4..c73faef617 100644
--- a/lxd/config/schema_test.go
+++ b/lxd/config/schema_test.go
@@ -3,7 +3,7 @@ package config_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/config/validators_test.go b/lxd/config/validators_test.go
index 44d6f3e072..91f02be319 100644
--- a/lxd/config/validators_test.go
+++ b/lxd/config/validators_test.go
@@ -3,7 +3,7 @@ package config_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/daemon.go b/lxd/daemon.go
index 8e8cd12c20..261208152c 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -30,35 +30,35 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery/identchecker"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/device"
-	"github.com/lxc/lxd/lxd/endpoints"
-	"github.com/lxc/lxd/lxd/events"
-	"github.com/lxc/lxd/lxd/firewall"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/ucred"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/device"
+	"github.com/grant-he/lxd/lxd/endpoints"
+	"github.com/grant-he/lxd/lxd/events"
+	"github.com/grant-he/lxd/lxd/firewall"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/ucred"
 
 	// Import instance/drivers without name so init() runs.
-	_ "github.com/lxc/lxd/lxd/instance/drivers"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/maas"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/rbac"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/seccomp"
-	"github.com/lxc/lxd/lxd/state"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
-
-	log "github.com/lxc/lxd/shared/log15"
+	_ "github.com/grant-he/lxd/lxd/instance/drivers"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/maas"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/rbac"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/seccomp"
+	"github.com/grant-he/lxd/lxd/state"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
+
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // A Daemon can respond to requests from a shared client.
diff --git a/lxd/daemon_config.go b/lxd/daemon_config.go
index 57b6f04533..90d3e1c9f2 100644
--- a/lxd/daemon_config.go
+++ b/lxd/daemon_config.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
 )
 
 func daemonConfigRender(state *state.State) (map[string]interface{}, error) {
diff --git a/lxd/daemon_images.go b/lxd/daemon_images.go
index 3a5b244d7e..4c28e5ed5c 100644
--- a/lxd/daemon_images.go
+++ b/lxd/daemon_images.go
@@ -12,20 +12,20 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/version"
-
-	log "github.com/lxc/lxd/shared/log15"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/version"
+
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 var imagesDownloading = map[string]chan bool{}
diff --git a/lxd/daemon_integration_test.go b/lxd/daemon_integration_test.go
index 2db5d9665f..daebc73de7 100644
--- a/lxd/daemon_integration_test.go
+++ b/lxd/daemon_integration_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logging"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/daemon_storage.go b/lxd/daemon_storage.go
index c1d85688b7..fc9f3769a7 100644
--- a/lxd/daemon_storage.go
+++ b/lxd/daemon_storage.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
 )
 
 func daemonStorageMount(s *state.State) error {
diff --git a/lxd/db/backups.go b/lxd/db/backups.go
index f54fe8bb2d..efe57ad745 100644
--- a/lxd/db/backups.go
+++ b/lxd/db/backups.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // InstanceBackup is a value object holding all db-related details about an instance backup.
diff --git a/lxd/db/certificates.mapper.go b/lxd/db/certificates.mapper.go
index c682094754..c4d554ea19 100644
--- a/lxd/db/certificates.mapper.go
+++ b/lxd/db/certificates.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/certificates_test.go b/lxd/db/certificates_test.go
index ebff1e66a5..a5ca32281e 100644
--- a/lxd/db/certificates_test.go
+++ b/lxd/db/certificates_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 func TestGetCertificate(t *testing.T) {
diff --git a/lxd/db/cluster/constants.go b/lxd/db/cluster/constants.go
index fbb616948c..68ce7c630b 100644
--- a/lxd/db/cluster/constants.go
+++ b/lxd/db/cluster/constants.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Numeric type codes identifying different kind of entities.
diff --git a/lxd/db/cluster/open.go b/lxd/db/cluster/open.go
index d888e15dfe..53dcc11a7e 100644
--- a/lxd/db/cluster/open.go
+++ b/lxd/db/cluster/open.go
@@ -7,13 +7,13 @@ import (
 	"sync/atomic"
 
 	driver "github.com/canonical/go-dqlite/driver"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/db/schema"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/cluster/open_test.go b/lxd/db/cluster/open_test.go
index 19c0b98ae5..827b7979ec 100644
--- a/lxd/db/cluster/open_test.go
+++ b/lxd/db/cluster/open_test.go
@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/cluster/query.go b/lxd/db/cluster/query.go
index 16b7aedf99..47216a052c 100644
--- a/lxd/db/cluster/query.go
+++ b/lxd/db/cluster/query.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 )
 
 // Update the schema and api_extensions columns of the row in the nodes table
diff --git a/lxd/db/cluster/update.go b/lxd/db/cluster/update.go
index 750097c693..ab741b4593 100644
--- a/lxd/db/cluster/update.go
+++ b/lxd/db/cluster/update.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/db/schema"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/cluster/update_test.go b/lxd/db/cluster/update_test.go
index a9f288b101..d0a0f8bcab 100644
--- a/lxd/db/cluster/update_test.go
+++ b/lxd/db/cluster/update_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/osarch"
 	"github.com/mattn/go-sqlite3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/config.go b/lxd/db/config.go
index b39e5ca0ae..22eb513af9 100644
--- a/lxd/db/config.go
+++ b/lxd/db/config.go
@@ -2,7 +2,7 @@
 
 package db
 
-import "github.com/lxc/lxd/lxd/db/query"
+import "github.com/grant-he/lxd/lxd/db/query"
 
 // Config fetches all LXD node-level config keys.
 func (n *NodeTx) Config() (map[string]string, error) {
diff --git a/lxd/db/config_test.go b/lxd/db/config_test.go
index 14ea76cf19..8db5e636b7 100644
--- a/lxd/db/config_test.go
+++ b/lxd/db/config_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/db.go b/lxd/db/db.go
index 232c0d531f..7f85a3bad2 100644
--- a/lxd/db/db.go
+++ b/lxd/db/db.go
@@ -13,11 +13,11 @@ import (
 	"github.com/canonical/go-dqlite/driver"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/node"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/node"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Node mediates access to LXD's data stored in the node-local SQLite database.
diff --git a/lxd/db/db_internal_test.go b/lxd/db/db_internal_test.go
index 064d7e476b..57ea437e91 100644
--- a/lxd/db/db_internal_test.go
+++ b/lxd/db/db_internal_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 const fixtures string = `
diff --git a/lxd/db/db_test.go b/lxd/db/db_test.go
index 61c3e0af55..42377ba9bc 100644
--- a/lxd/db/db_test.go
+++ b/lxd/db/db_test.go
@@ -5,8 +5,8 @@ package db_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/images.go b/lxd/db/images.go
index 96346a26ae..bf69754453 100644
--- a/lxd/db/images.go
+++ b/lxd/db/images.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 // Code generation directives.
diff --git a/lxd/db/images.mapper.go b/lxd/db/images.mapper.go
index d656884b1e..4b540af7a5 100644
--- a/lxd/db/images.mapper.go
+++ b/lxd/db/images.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/images_test.go b/lxd/db/images_test.go
index f7866fcaf5..53038aaf98 100644
--- a/lxd/db/images_test.go
+++ b/lxd/db/images_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/instances.go b/lxd/db/instances.go
index f4f46107cf..9559bbb107 100644
--- a/lxd/db/instances.go
+++ b/lxd/db/instances.go
@@ -9,12 +9,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db/query"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/instances.mapper.go b/lxd/db/instances.mapper.go
index 6beb76d263..eef6d081c2 100644
--- a/lxd/db/instances.mapper.go
+++ b/lxd/db/instances.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/instances_test.go b/lxd/db/instances_test.go
index d6b71eb974..d0a2ccc7d8 100644
--- a/lxd/db/instances_test.go
+++ b/lxd/db/instances_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func TestContainerList(t *testing.T) {
diff --git a/lxd/db/legacy.go b/lxd/db/legacy.go
index d01b3ea9ac..68dbbdac54 100644
--- a/lxd/db/legacy.go
+++ b/lxd/db/legacy.go
@@ -5,7 +5,7 @@ package db
 import (
 	"database/sql"
 
-	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/lxd/db/schema"
 )
 
 // LegacyPatch is a "database" update that performs non-database work. They
diff --git a/lxd/db/migration.go b/lxd/db/migration.go
index 32aede1ad7..871e187721 100644
--- a/lxd/db/migration.go
+++ b/lxd/db/migration.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go
index fb2c07d16c..8399525311 100644
--- a/lxd/db/migration_test.go
+++ b/lxd/db/migration_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/project"
 )
 
 func TestLoadPreClusteringData(t *testing.T) {
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index b2549cabd5..b005c6ea9b 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // GetNetworksLocalConfig returns a map associating each network name to its
diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go
index 8d021afd84..b14aabd0dd 100644
--- a/lxd/db/networks_test.go
+++ b/lxd/db/networks_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/project"
 )
 
 // The GetNetworksLocalConfigs method returns only node-specific config values.
diff --git a/lxd/db/node.go b/lxd/db/node.go
index 3afa6a073c..630a7cd3fb 100644
--- a/lxd/db/node.go
+++ b/lxd/db/node.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // ClusterRole represents the role of a member in a cluster.
diff --git a/lxd/db/node/open.go b/lxd/db/node/open.go
index b49bed1961..513ab13f81 100644
--- a/lxd/db/node/open.go
+++ b/lxd/db/node/open.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/lxc/lxd/lxd/db/schema"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Open the node-local database object.
diff --git a/lxd/db/node/open_test.go b/lxd/db/node/open_test.go
index 1610404428..6f90e7e802 100644
--- a/lxd/db/node/open_test.go
+++ b/lxd/db/node/open_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/node"
+	"github.com/grant-he/lxd/lxd/db/node"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/node/update.go b/lxd/db/node/update.go
index 4a1c35a9d4..15a01c45b4 100644
--- a/lxd/db/node/update.go
+++ b/lxd/db/node/update.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/db/schema"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Schema for the local database.
diff --git a/lxd/db/node/update_test.go b/lxd/db/node/update_test.go
index 6f204fb291..251c91718d 100644
--- a/lxd/db/node/update_test.go
+++ b/lxd/db/node/update_test.go
@@ -4,9 +4,9 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/node"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db/node"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/node_test.go b/lxd/db/node_test.go
index 5a0dd559d7..0fc580168d 100644
--- a/lxd/db/node_test.go
+++ b/lxd/db/node_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/operations.go b/lxd/db/operations.go
index 203c1d5b9c..2c0a574359 100644
--- a/lxd/db/operations.go
+++ b/lxd/db/operations.go
@@ -5,7 +5,7 @@ package db
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/operations_test.go b/lxd/db/operations_test.go
index ecbdbf5c4b..fa1e769b84 100644
--- a/lxd/db/operations_test.go
+++ b/lxd/db/operations_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/patches.go b/lxd/db/patches.go
index cd5ddb1e60..4edee732f2 100644
--- a/lxd/db/patches.go
+++ b/lxd/db/patches.go
@@ -5,7 +5,7 @@ package db
 import (
 	"database/sql"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 )
 
 // GetAppliedPatches returns the names of all patches currently applied on this node.
diff --git a/lxd/db/profiles.go b/lxd/db/profiles.go
index f04eeabe26..3c7b3ce58f 100644
--- a/lxd/db/profiles.go
+++ b/lxd/db/profiles.go
@@ -5,8 +5,8 @@ package db
 import (
 	"fmt"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/shared/api"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/profiles.mapper.go b/lxd/db/profiles.mapper.go
index 6df1fdcd66..d01b2d32f0 100644
--- a/lxd/db/profiles.mapper.go
+++ b/lxd/db/profiles.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/projects.go b/lxd/db/projects.go
index ff613611d1..55df769fe5 100644
--- a/lxd/db/projects.go
+++ b/lxd/db/projects.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Code generation directives.
diff --git a/lxd/db/projects.mapper.go b/lxd/db/projects.mapper.go
index 6c8565127b..dc20489d30 100644
--- a/lxd/db/projects.mapper.go
+++ b/lxd/db/projects.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/projects_test.go b/lxd/db/projects_test.go
index 7393d9fb5f..67fcbeea3a 100644
--- a/lxd/db/projects_test.go
+++ b/lxd/db/projects_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/query/config_test.go b/lxd/db/query/config_test.go
index d77026d172..97c57e0d29 100644
--- a/lxd/db/query/config_test.go
+++ b/lxd/db/query/config_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/query/count_test.go b/lxd/db/query/count_test.go
index 3e69c58eb0..71136f4e75 100644
--- a/lxd/db/query/count_test.go
+++ b/lxd/db/query/count_test.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/query/dump_test.go b/lxd/db/query/dump_test.go
index 3f6c4a676a..2608f526ca 100644
--- a/lxd/db/query/dump_test.go
+++ b/lxd/db/query/dump_test.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/query/objects_test.go b/lxd/db/query/objects_test.go
index 1551261fd1..db8e250994 100644
--- a/lxd/db/query/objects_test.go
+++ b/lxd/db/query/objects_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/query/retry.go b/lxd/db/query/retry.go
index dd44e47e26..fcc07dc581 100644
--- a/lxd/db/query/retry.go
+++ b/lxd/db/query/retry.go
@@ -10,7 +10,7 @@ import (
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 const maxRetries = 250
diff --git a/lxd/db/query/slices_test.go b/lxd/db/query/slices_test.go
index 471747d4c0..a6e6adf1c6 100644
--- a/lxd/db/query/slices_test.go
+++ b/lxd/db/query/slices_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/subtest"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/subtest"
 )
 
 func TestSelectURIs(t *testing.T) {
diff --git a/lxd/db/query/transaction.go b/lxd/db/query/transaction.go
index 901177b0e8..c205e943ab 100644
--- a/lxd/db/query/transaction.go
+++ b/lxd/db/query/transaction.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"strings"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/query/transaction_test.go b/lxd/db/query/transaction_test.go
index 8b73b15d13..a391211ef8 100644
--- a/lxd/db/query/transaction_test.go
+++ b/lxd/db/query/transaction_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/db/raft.go b/lxd/db/raft.go
index 4444471299..163dd79f21 100644
--- a/lxd/db/raft.go
+++ b/lxd/db/raft.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/canonical/go-dqlite/client"
-	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/query"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/raft_test.go b/lxd/db/raft_test.go
index be881f167a..d0793b9de9 100644
--- a/lxd/db/raft_test.go
+++ b/lxd/db/raft_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/schema/query.go b/lxd/db/schema/query.go
index f0e1eed8f0..9d5fdb222c 100644
--- a/lxd/db/schema/query.go
+++ b/lxd/db/schema/query.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/schema/schema.go b/lxd/db/schema/schema.go
index 8d8435ef11..e5bcfee2bc 100644
--- a/lxd/db/schema/schema.go
+++ b/lxd/db/schema/schema.go
@@ -6,8 +6,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/schema/schema_test.go b/lxd/db/schema/schema_test.go
index 2854642827..6e97025e1f 100644
--- a/lxd/db/schema/schema_test.go
+++ b/lxd/db/schema/schema_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/db/schema"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Create a new Schema by specifying an explicit map from versions to Update
diff --git a/lxd/db/schema/update_test.go b/lxd/db/schema/update_test.go
index 8e3449a023..215d4a7ce4 100644
--- a/lxd/db/schema/update_test.go
+++ b/lxd/db/schema/update_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db/schema"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/grant-he/lxd/shared"
 )
 
 // A Go source file matching the given prefix is created in the calling
diff --git a/lxd/db/snapshots.go b/lxd/db/snapshots.go
index 4683eab328..972d6ba0e3 100644
--- a/lxd/db/snapshots.go
+++ b/lxd/db/snapshots.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Code generation directives.
diff --git a/lxd/db/snapshots.mapper.go b/lxd/db/snapshots.mapper.go
index e4300b2b8c..931f6d6e50 100644
--- a/lxd/db/snapshots.mapper.go
+++ b/lxd/db/snapshots.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/snapshots_test.go b/lxd/db/snapshots_test.go
index d9d2f445ae..560186ab78 100644
--- a/lxd/db/snapshots_test.go
+++ b/lxd/db/snapshots_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func TestGetInstanceSnapshots(t *testing.T) {
diff --git a/lxd/db/storage_pools.go b/lxd/db/storage_pools.go
index 76d12693d1..6882ee4c4b 100644
--- a/lxd/db/storage_pools.go
+++ b/lxd/db/storage_pools.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // StorageRemoteDriverNames returns a list of remote storage driver names.
diff --git a/lxd/db/storage_pools_export_test.go b/lxd/db/storage_pools_export_test.go
index 1225bc0c71..020ce07f2f 100644
--- a/lxd/db/storage_pools_export_test.go
+++ b/lxd/db/storage_pools_export_test.go
@@ -2,7 +2,7 @@
 
 package db
 
-import "github.com/lxc/lxd/shared/api"
+import "github.com/grant-he/lxd/shared/api"
 
 func (c *Cluster) GetStoragePoolVolume(project string, volumeName string, volumeType int, poolID, nodeID int64) (int64, *api.StorageVolume, error) {
 	return c.storagePoolVolumeGetType(project, volumeName, volumeType, poolID, nodeID)
diff --git a/lxd/db/storage_pools_test.go b/lxd/db/storage_pools_test.go
index 9830798068..2135bbea01 100644
--- a/lxd/db/storage_pools_test.go
+++ b/lxd/db/storage_pools_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/storage_volume_snapshots.go b/lxd/db/storage_volume_snapshots.go
index e0755d8d33..95d4b3f0e1 100644
--- a/lxd/db/storage_volume_snapshots.go
+++ b/lxd/db/storage_volume_snapshots.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // CreateStorageVolumeSnapshot creates a new storage volume snapshot attached to a given
diff --git a/lxd/db/storage_volumes.go b/lxd/db/storage_volumes.go
index 261784ce1f..6711a69d01 100644
--- a/lxd/db/storage_volumes.go
+++ b/lxd/db/storage_volumes.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/storage_volumes_test.go b/lxd/db/storage_volumes_test.go
index 557a23b449..f5aba6e02b 100644
--- a/lxd/db/storage_volumes_test.go
+++ b/lxd/db/storage_volumes_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/device/device_common.go b/lxd/device/device_common.go
index 4de9509d01..45466edc35 100644
--- a/lxd/device/device_common.go
+++ b/lxd/device/device_common.go
@@ -3,12 +3,12 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 // deviceCommon represents the common struct for all devices.
diff --git a/lxd/device/device_interface.go b/lxd/device/device_interface.go
index 9046163bbd..8f361c6cab 100644
--- a/lxd/device/device_interface.go
+++ b/lxd/device/device_interface.go
@@ -1,10 +1,10 @@
 package device
 
 import (
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared/api"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // VolatileSetter is a function that accepts one or more key/value strings to save into the LXD
diff --git a/lxd/device/device_load.go b/lxd/device/device_load.go
index cf4b521a59..6e6dff7947 100644
--- a/lxd/device/device_load.go
+++ b/lxd/device/device_load.go
@@ -3,10 +3,10 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
 )
 
 // load instantiates a device and initialises its internal state. It does not validate the config supplied.
diff --git a/lxd/device/device_utils_disk.go b/lxd/device/device_utils_disk.go
index 217be7e157..3752b107d9 100644
--- a/lxd/device/device_utils_disk.go
+++ b/lxd/device/device_utils_disk.go
@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // BlockFsDetect detects the type of block device.
diff --git a/lxd/device/device_utils_generic.go b/lxd/device/device_utils_generic.go
index 819353e0b6..bb8b8faf20 100644
--- a/lxd/device/device_utils_generic.go
+++ b/lxd/device/device_utils_generic.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
 )
 
 // deviceJoinPath joins together prefix and text delimited by a "." for device path generation.
diff --git a/lxd/device/device_utils_infiniband.go b/lxd/device/device_utils_infiniband.go
index 77a3aba2d9..b152aa2ee9 100644
--- a/lxd/device/device_utils_infiniband.go
+++ b/lxd/device/device_utils_infiniband.go
@@ -5,9 +5,9 @@ import (
 	"net"
 	"strings"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared/api"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // IBDevPrefix Infiniband devices prefix.
diff --git a/lxd/device/device_utils_inotify.go b/lxd/device/device_utils_inotify.go
index 30a3ba6501..d1675ac5ff 100644
--- a/lxd/device/device_utils_inotify.go
+++ b/lxd/device/device_utils_inotify.go
@@ -8,11 +8,11 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 const inotifyBatchInEvents uint = 100
diff --git a/lxd/device/device_utils_instance.go b/lxd/device/device_utils_instance.go
index c0793f06a6..5fb6482335 100644
--- a/lxd/device/device_utils_instance.go
+++ b/lxd/device/device_utils_instance.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"sync"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/state"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/state"
 )
 
 // reservedDevicesMutex used to coordinate access for checking reserved devices.
diff --git a/lxd/device/device_utils_network.go b/lxd/device/device_utils_network.go
index 74483dbce1..d35712e6e6 100644
--- a/lxd/device/device_utils_network.go
+++ b/lxd/device/device_utils_network.go
@@ -10,18 +10,18 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // Instances can be started in parallel, so lock the creation of VLANs.
diff --git a/lxd/device/device_utils_proxy.go b/lxd/device/device_utils_proxy.go
index 29d53eeb7a..bb382a8919 100644
--- a/lxd/device/device_utils_proxy.go
+++ b/lxd/device/device_utils_proxy.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // ProxyParseAddr validates a proxy address and parses it into its constituent parts.
diff --git a/lxd/device/device_utils_unix.go b/lxd/device/device_utils_unix.go
index dcde09495c..957b6331b6 100644
--- a/lxd/device/device_utils_unix.go
+++ b/lxd/device/device_utils_unix.go
@@ -10,12 +10,12 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/state"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/state"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // unixDefaultMode default mode to create unix devices with if not specified in device config.
diff --git a/lxd/device/device_utils_unix_events.go b/lxd/device/device_utils_unix_events.go
index a85095f7b6..f115028772 100644
--- a/lxd/device/device_utils_unix_events.go
+++ b/lxd/device/device_utils_unix_events.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"sync"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // UnixEvent represents the properties of a Unix device inotify event.
diff --git a/lxd/device/device_utils_unix_hotplug_events.go b/lxd/device/device_utils_unix_hotplug_events.go
index aa7ef17697..534e42f273 100644
--- a/lxd/device/device_utils_unix_hotplug_events.go
+++ b/lxd/device/device_utils_unix_hotplug_events.go
@@ -6,11 +6,11 @@ import (
 	"strings"
 	"sync"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // UnixHotplugEvent represents the properties of a Unix hotplug device uevent.
diff --git a/lxd/device/device_utils_usb_events.go b/lxd/device/device_utils_usb_events.go
index 18840eafb2..3e01e2645f 100644
--- a/lxd/device/device_utils_usb_events.go
+++ b/lxd/device/device_utils_usb_events.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"sync"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // USBEvent represents the properties of a USB device uevent.
diff --git a/lxd/device/disk.go b/lxd/device/disk.go
index 546bb945b3..63e19d5f60 100644
--- a/lxd/device/disk.go
+++ b/lxd/device/disk.go
@@ -14,23 +14,23 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/subprocess"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/subprocess"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // Special disk "source" value used for generating a VM cloud-init config ISO.
diff --git a/lxd/device/gpu.go b/lxd/device/gpu.go
index 9c7724077b..b387465191 100644
--- a/lxd/device/gpu.go
+++ b/lxd/device/gpu.go
@@ -12,12 +12,12 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/resources"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/resources"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 const gpuDRIDevPath = "/dev/dri"
diff --git a/lxd/device/infiniband_physical.go b/lxd/device/infiniband_physical.go
index fc1046262a..e31f668292 100644
--- a/lxd/device/infiniband_physical.go
+++ b/lxd/device/infiniband_physical.go
@@ -3,12 +3,12 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/resources"
-	"github.com/lxc/lxd/shared"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/resources"
+	"github.com/grant-he/lxd/shared"
 )
 
 type infinibandPhysical struct {
diff --git a/lxd/device/infiniband_sriov.go b/lxd/device/infiniband_sriov.go
index 953bbcbb54..100e52d585 100644
--- a/lxd/device/infiniband_sriov.go
+++ b/lxd/device/infiniband_sriov.go
@@ -3,13 +3,13 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/resources"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/resources"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type infinibandSRIOV struct {
diff --git a/lxd/device/nic.go b/lxd/device/nic.go
index 3aa3d164c2..3c65a2a7b0 100644
--- a/lxd/device/nic.go
+++ b/lxd/device/nic.go
@@ -1,7 +1,7 @@
 package device
 
 import (
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // nicValidationRules returns config validation rules for nic devices.
diff --git a/lxd/device/nic_bridged.go b/lxd/device/nic_bridged.go
index f4b6144adf..9dd28cc8ba 100644
--- a/lxd/device/nic_bridged.go
+++ b/lxd/device/nic_bridged.go
@@ -16,23 +16,23 @@ import (
 	"github.com/mdlayher/netx/eui64"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/dnsmasq"
-	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
-	firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/network/openvswitch"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/dnsmasq"
+	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
+	firewallDrivers "github.com/grant-he/lxd/lxd/firewall/drivers"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/network/openvswitch"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 type nicBridged struct {
diff --git a/lxd/device/nic_ipvlan.go b/lxd/device/nic_ipvlan.go
index 86582085a1..5728be602f 100644
--- a/lxd/device/nic_ipvlan.go
+++ b/lxd/device/nic_ipvlan.go
@@ -5,13 +5,13 @@ import (
 	"net"
 	"strings"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 const ipvlanModeL3S = "l3s"
diff --git a/lxd/device/nic_macvlan.go b/lxd/device/nic_macvlan.go
index d40f3f6629..449baff5be 100644
--- a/lxd/device/nic_macvlan.go
+++ b/lxd/device/nic_macvlan.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type nicMACVLAN struct {
diff --git a/lxd/device/nic_ovn.go b/lxd/device/nic_ovn.go
index 48bc65fd4d..4258d0d9a3 100644
--- a/lxd/device/nic_ovn.go
+++ b/lxd/device/nic_ovn.go
@@ -9,19 +9,19 @@ import (
 	"github.com/mdlayher/netx/eui64"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/network/openvswitch"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
+	"github.com/grant-he/lxd/lxd/cluster"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/network/openvswitch"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // ovnNet defines an interface for accessing instance specific functions on OVN network.
diff --git a/lxd/device/nic_p2p.go b/lxd/device/nic_p2p.go
index 69a57ef7d9..c2a1ba9037 100644
--- a/lxd/device/nic_p2p.go
+++ b/lxd/device/nic_p2p.go
@@ -3,12 +3,12 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
 )
 
 type nicP2P struct {
diff --git a/lxd/device/nic_physical.go b/lxd/device/nic_physical.go
index 7d7400bbbc..8f8042b8f1 100644
--- a/lxd/device/nic_physical.go
+++ b/lxd/device/nic_physical.go
@@ -5,13 +5,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 type nicPhysical struct {
diff --git a/lxd/device/nic_routed.go b/lxd/device/nic_routed.go
index ca056a4dac..58db2ca81c 100644
--- a/lxd/device/nic_routed.go
+++ b/lxd/device/nic_routed.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 const nicRoutedIPv4GW = "169.254.0.1"
diff --git a/lxd/device/nic_sriov.go b/lxd/device/nic_sriov.go
index 70d0cabc0f..a8f2c001d4 100644
--- a/lxd/device/nic_sriov.go
+++ b/lxd/device/nic_sriov.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type nicSRIOV struct {
diff --git a/lxd/device/nictype/nictype.go b/lxd/device/nictype/nictype.go
index 5c8ef08209..bd6a28a812 100644
--- a/lxd/device/nictype/nictype.go
+++ b/lxd/device/nictype/nictype.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
 )
 
 // NICType resolves the NIC Type for the supplied NIC device config.
diff --git a/lxd/device/none.go b/lxd/device/none.go
index dcd2a70dba..ee714ba4e7 100644
--- a/lxd/device/none.go
+++ b/lxd/device/none.go
@@ -1,8 +1,8 @@
 package device
 
 import (
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
 )
 
 type none struct {
diff --git a/lxd/device/proxy.go b/lxd/device/proxy.go
index d169a4671e..93e0913977 100644
--- a/lxd/device/proxy.go
+++ b/lxd/device/proxy.go
@@ -13,17 +13,17 @@ import (
 	"github.com/pkg/errors"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/lxc/lxd/lxd/apparmor"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/subprocess"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/apparmor"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/subprocess"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 type proxy struct {
diff --git a/lxd/device/tpm.go b/lxd/device/tpm.go
index 47d7c9b73f..254a637c1d 100644
--- a/lxd/device/tpm.go
+++ b/lxd/device/tpm.go
@@ -11,14 +11,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/subprocess"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/subprocess"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 type tpm struct {
diff --git a/lxd/device/unix_common.go b/lxd/device/unix_common.go
index 156e5d2600..fe4c640e2c 100644
--- a/lxd/device/unix_common.go
+++ b/lxd/device/unix_common.go
@@ -5,12 +5,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // unixIsOurDeviceType checks that device file type matches what we are expecting in the config.
diff --git a/lxd/device/unix_hotplug.go b/lxd/device/unix_hotplug.go
index 6f3f39370a..62e8b5532e 100644
--- a/lxd/device/unix_hotplug.go
+++ b/lxd/device/unix_hotplug.go
@@ -8,11 +8,11 @@ import (
 
 	udev "github.com/farjump/go-libudev"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // unixHotplugIsOurDevice indicates whether the unixHotplug device event qualifies as part of our device.
diff --git a/lxd/device/usb.go b/lxd/device/usb.go
index e668acf278..d38ad89d82 100644
--- a/lxd/device/usb.go
+++ b/lxd/device/usb.go
@@ -7,12 +7,12 @@ import (
 	"path"
 	"strings"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/validate"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // usbDevPath is the path where USB devices can be enumerated.
diff --git a/lxd/devices.go b/lxd/devices.go
index 67d3def366..98e852fa4b 100644
--- a/lxd/devices.go
+++ b/lxd/devices.go
@@ -12,17 +12,17 @@ import (
 	"golang.org/x/sys/unix"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
-
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/device"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/resources"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	_ "github.com/grant-he/lxd/lxd/include"
+
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/device"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/resources"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 /*
diff --git a/lxd/devlxd.go b/lxd/devlxd.go
index 7256ab6525..18a79d57d7 100644
--- a/lxd/devlxd.go
+++ b/lxd/devlxd.go
@@ -17,16 +17,16 @@ import (
 	"github.com/gorilla/mux"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/ucred"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/ucred"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // DevLxdServer creates an http.Server capable of handling requests against the
diff --git a/lxd/devlxd_test.go b/lxd/devlxd_test.go
index 5902358f8b..4d8ae45ba1 100644
--- a/lxd/devlxd_test.go
+++ b/lxd/devlxd_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/lxd/ucred"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/ucred"
 )
 
 var testDir string
diff --git a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go
index f52a2c1ac5..ddbfa8cadc 100644
--- a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go
+++ b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/mdlayher/netx/eui64"
 
-	"github.com/lxc/lxd/lxd/dnsmasq"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/dnsmasq"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 // ErrDHCPNotSupported indicates network doesn't support DHCP for this IP protocol.
diff --git a/lxd/dnsmasq/dnsmasq.go b/lxd/dnsmasq/dnsmasq.go
index d8491c2572..41d83c9f72 100644
--- a/lxd/dnsmasq/dnsmasq.go
+++ b/lxd/dnsmasq/dnsmasq.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/subprocess"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/subprocess"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // DHCPAllocation represents an IP allocation from dnsmasq.
diff --git a/lxd/endpoints/cluster.go b/lxd/endpoints/cluster.go
index 6e977d25e1..3619de6e44 100644
--- a/lxd/endpoints/cluster.go
+++ b/lxd/endpoints/cluster.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // ClusterAddress returns the cluster addresss of the cluster endpoint, or an
diff --git a/lxd/endpoints/devlxd_test.go b/lxd/endpoints/devlxd_test.go
index f92c0bbf2c..41d9389cd8 100644
--- a/lxd/endpoints/devlxd_test.go
+++ b/lxd/endpoints/devlxd_test.go
@@ -3,7 +3,7 @@ package endpoints_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/endpoints.go b/lxd/endpoints/endpoints.go
index 717649e0e6..4fdf33ecb2 100644
--- a/lxd/endpoints/endpoints.go
+++ b/lxd/endpoints/endpoints.go
@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 	tomb "gopkg.in/tomb.v2"
 )
 
diff --git a/lxd/endpoints/endpoints_exported_test.go b/lxd/endpoints/endpoints_exported_test.go
index cc4802fee8..d6217ca49e 100644
--- a/lxd/endpoints/endpoints_exported_test.go
+++ b/lxd/endpoints/endpoints_exported_test.go
@@ -1,8 +1,8 @@
 package endpoints
 
 import (
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 // New creates a new Endpoints instance without bringing it up.
diff --git a/lxd/endpoints/endpoints_test.go b/lxd/endpoints/endpoints_test.go
index a51f003edb..2e8c2ef7ad 100644
--- a/lxd/endpoints/endpoints_test.go
+++ b/lxd/endpoints/endpoints_test.go
@@ -12,11 +12,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/endpoints"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/endpoints"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/local_test.go b/lxd/endpoints/local_test.go
index 57b34c19be..d3456b5c80 100644
--- a/lxd/endpoints/local_test.go
+++ b/lxd/endpoints/local_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/network.go b/lxd/endpoints/network.go
index 6d9f4f1e5c..4c4092dbfb 100644
--- a/lxd/endpoints/network.go
+++ b/lxd/endpoints/network.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/endpoints/network_test.go b/lxd/endpoints/network_test.go
index f59e7c65b7..ad63a5ef4f 100644
--- a/lxd/endpoints/network_test.go
+++ b/lxd/endpoints/network_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/pprof.go b/lxd/endpoints/pprof.go
index 75bb0513b7..9ed92588e7 100644
--- a/lxd/endpoints/pprof.go
+++ b/lxd/endpoints/pprof.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared/logger"
 
 	_ "net/http/pprof" // pprof magic
 )
diff --git a/lxd/endpoints/socket.go b/lxd/endpoints/socket.go
index 98a81a2646..6b6d9a7307 100644
--- a/lxd/endpoints/socket.go
+++ b/lxd/endpoints/socket.go
@@ -9,9 +9,9 @@ import (
 	"os/user"
 	"strconv"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Bind to the given unix socket path.
diff --git a/lxd/events.go b/lxd/events.go
index 80b2378dbd..be9a419dc9 100644
--- a/lxd/events.go
+++ b/lxd/events.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var eventTypes = []string{"logging", "operation", "lifecycle"}
diff --git a/lxd/events/events.go b/lxd/events/events.go
index ef713d73d1..f4fb584921 100644
--- a/lxd/events/events.go
+++ b/lxd/events/events.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pborman/uuid"
 
 	"github.com/gorilla/websocket"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Server represents an instance of an event server.
diff --git a/lxd/events/logging.go b/lxd/events/logging.go
index fed38c4a8a..b9789ebadd 100644
--- a/lxd/events/logging.go
+++ b/lxd/events/logging.go
@@ -3,9 +3,9 @@ package events
 import (
 	"fmt"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // LoggingServer controls what server to use for messages coming from the logger.
diff --git a/lxd/filter/clause.go b/lxd/filter/clause.go
index 4b6d0a836b..c4e76745f4 100644
--- a/lxd/filter/clause.go
+++ b/lxd/filter/clause.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Clause is a single filter clause in a filter string.
diff --git a/lxd/filter/clause_test.go b/lxd/filter/clause_test.go
index 0cfa73f5f9..74508f2978 100644
--- a/lxd/filter/clause_test.go
+++ b/lxd/filter/clause_test.go
@@ -3,7 +3,7 @@ package filter_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/filter"
+	"github.com/grant-he/lxd/lxd/filter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/filter/match_test.go b/lxd/filter/match_test.go
index cdd719cbe6..1f3f37cf8d 100644
--- a/lxd/filter/match_test.go
+++ b/lxd/filter/match_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/filter"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/filter"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/filter/value_test.go b/lxd/filter/value_test.go
index 9669115560..4669b694f8 100644
--- a/lxd/filter/value_test.go
+++ b/lxd/filter/value_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/filter"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/filter"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/firewall/drivers/drivers_nftables.go b/lxd/firewall/drivers/drivers_nftables.go
index 887f9469f9..7cbdd09b40 100644
--- a/lxd/firewall/drivers/drivers_nftables.go
+++ b/lxd/firewall/drivers/drivers_nftables.go
@@ -13,10 +13,10 @@ import (
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/version"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 const nftablesNamespace = "lxd"
diff --git a/lxd/firewall/drivers/drivers_xtables.go b/lxd/firewall/drivers/drivers_xtables.go
index 68828a27b2..b5518d5a66 100644
--- a/lxd/firewall/drivers/drivers_xtables.go
+++ b/lxd/firewall/drivers/drivers_xtables.go
@@ -10,11 +10,11 @@ import (
 	"strconv"
 	"strings"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Xtables is an implmentation of LXD firewall using {ip, ip6, eb}tables
diff --git a/lxd/firewall/firewall_interface.go b/lxd/firewall/firewall_interface.go
index 103b5fa11e..0103663088 100644
--- a/lxd/firewall/firewall_interface.go
+++ b/lxd/firewall/firewall_interface.go
@@ -3,7 +3,7 @@ package firewall
 import (
 	"net"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
 )
 
 // Firewall represents an LXD firewall.
diff --git a/lxd/firewall/firewall_load.go b/lxd/firewall/firewall_load.go
index ec332e703d..c31264d993 100644
--- a/lxd/firewall/firewall_load.go
+++ b/lxd/firewall/firewall_load.go
@@ -1,8 +1,8 @@
 package firewall
 
 import (
-	"github.com/lxc/lxd/lxd/firewall/drivers"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/firewall/drivers"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // New returns an appropriate firewall implementation.
diff --git a/lxd/images.go b/lxd/images.go
index 4fb55b9087..a8c3815d24 100644
--- a/lxd/images.go
+++ b/lxd/images.go
@@ -26,28 +26,28 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/filter"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/operations"
-	projectutils "github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/filter"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/operations"
+	projectutils "github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var imagesCmd = APIEndpoint{
diff --git a/lxd/init.go b/lxd/init.go
index 2311b6c3a6..05fa41c414 100644
--- a/lxd/init.go
+++ b/lxd/init.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type initDataNode struct {
diff --git a/lxd/instance.go b/lxd/instance.go
index b58dbe08af..9c695dfdbb 100644
--- a/lxd/instance.go
+++ b/lxd/instance.go
@@ -15,21 +15,21 @@ import (
 	cron "gopkg.in/robfig/cron.v2"
 
 	"github.com/flosch/pongo2"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 // Helper functions
diff --git a/lxd/instance/drivers/driver_common.go b/lxd/instance/drivers/driver_common.go
index f98bd1db69..a3eb92ace3 100644
--- a/lxd/instance/drivers/driver_common.go
+++ b/lxd/instance/drivers/driver_common.go
@@ -4,12 +4,12 @@ import (
 	"errors"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // common provides structure common to all instance types.
diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go
index 2a23d02e7b..659bc67b6b 100644
--- a/lxd/instance/drivers/driver_lxc.go
+++ b/lxd/instance/drivers/driver_lxc.go
@@ -25,40 +25,40 @@ import (
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/apparmor"
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/device"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/instance/operationlock"
-	"github.com/lxc/lxd/lxd/maas"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/seccomp"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/template"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/instancewriter"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/netutils"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/apparmor"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/device"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/instance/operationlock"
+	"github.com/grant-he/lxd/lxd/maas"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/seccomp"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/template"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/netutils"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Helper functions
diff --git a/lxd/instance/drivers/driver_lxc_cmd.go b/lxd/instance/drivers/driver_lxc_cmd.go
index 7d80898e47..bb77b41636 100644
--- a/lxd/instance/drivers/driver_lxc_cmd.go
+++ b/lxd/instance/drivers/driver_lxc_cmd.go
@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // lxcCmd represents a running command for an LXC container.
diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
index e243634547..3b85e7fd1f 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -26,42 +26,42 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
 
-	lxdClient "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/apparmor"
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/device"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/drivers/qmp"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/instance/operationlock"
-	"github.com/lxc/lxd/lxd/maas"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/resources"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	pongoTemplate "github.com/lxc/lxd/lxd/template"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/lxd/vsock"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/subprocess"
-	"github.com/lxc/lxd/shared/termios"
-	"github.com/lxc/lxd/shared/units"
+	lxdClient "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/apparmor"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/device"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/drivers/qmp"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/instance/operationlock"
+	"github.com/grant-he/lxd/lxd/maas"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/resources"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	pongoTemplate "github.com/grant-he/lxd/lxd/template"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/lxd/vsock"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/subprocess"
+	"github.com/grant-he/lxd/shared/termios"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // qemuAsyncIO is used to indicate disk should use unsafe cache I/O.
diff --git a/lxd/instance/drivers/driver_qemu_cmd.go b/lxd/instance/drivers/driver_qemu_cmd.go
index edc7e5ed25..8b1df8f250 100644
--- a/lxd/instance/drivers/driver_qemu_cmd.go
+++ b/lxd/instance/drivers/driver_qemu_cmd.go
@@ -5,9 +5,9 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	lxdClient "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	lxdClient "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Cmd represents a running command for an Qemu VM.
diff --git a/lxd/instance/drivers/load.go b/lxd/instance/drivers/load.go
index f478c75ed4..d0f9d49abf 100644
--- a/lxd/instance/drivers/load.go
+++ b/lxd/instance/drivers/load.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/device"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/device"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func init() {
diff --git a/lxd/instance/drivers/qmp/monitor.go b/lxd/instance/drivers/qmp/monitor.go
index 9a93911a5a..2e3200c916 100644
--- a/lxd/instance/drivers/qmp/monitor.go
+++ b/lxd/instance/drivers/qmp/monitor.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/digitalocean/go-qemu/qmp"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 var monitors = map[string]*Monitor{}
diff --git a/lxd/instance/drivers/test_util.go b/lxd/instance/drivers/test_util.go
index 6ea131b995..3969ae73e2 100644
--- a/lxd/instance/drivers/test_util.go
+++ b/lxd/instance/drivers/test_util.go
@@ -1,8 +1,8 @@
 package drivers
 
 import (
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
 )
 
 // PrepareEqualTest modifies any unexported variables required for reflect.DeepEqual to complete safely.
diff --git a/lxd/instance/filter.go b/lxd/instance/filter.go
index 495f6717b5..b55e974712 100644
--- a/lxd/instance/filter.go
+++ b/lxd/instance/filter.go
@@ -1,8 +1,8 @@
 package instance
 
 import (
-	"github.com/lxc/lxd/lxd/filter"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/filter"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Filter returns a filtered list of instances that match the given clauses.
diff --git a/lxd/instance/instance_interface.go b/lxd/instance/instance_interface.go
index c096230bf3..aa3e16d1ff 100644
--- a/lxd/instance/instance_interface.go
+++ b/lxd/instance/instance_interface.go
@@ -7,14 +7,14 @@ import (
 
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
 )
 
 // HookStart hook used when instance has started.
diff --git a/lxd/instance/instance_utils.go b/lxd/instance/instance_utils.go
index 589ab7b567..21784f4825 100644
--- a/lxd/instance/instance_utils.go
+++ b/lxd/instance/instance_utils.go
@@ -12,22 +12,22 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/seccomp"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/seccomp"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // ValidDevices is linked from instance/drivers.validDevices to validate device config.
diff --git a/lxd/instance/instancetype/instance_type.go b/lxd/instance/instancetype/instance_type.go
index 55a040086a..085b8bf36b 100644
--- a/lxd/instance/instancetype/instance_type.go
+++ b/lxd/instance/instancetype/instance_type.go
@@ -3,7 +3,7 @@ package instancetype
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Type indicates the type of instance.
diff --git a/lxd/instance_backup.go b/lxd/instance_backup.go
index 4f9dfd8011..4eed39e775 100644
--- a/lxd/instance_backup.go
+++ b/lxd/instance_backup.go
@@ -10,15 +10,15 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 func containerBackupsGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_console.go b/lxd/instance_console.go
index ea1c7e225d..52ed8558ce 100644
--- a/lxd/instance_console.go
+++ b/lxd/instance_console.go
@@ -14,17 +14,17 @@ import (
 	"golang.org/x/sys/unix"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/termios"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/termios"
 )
 
 type consoleWs struct {
diff --git a/lxd/instance_delete.go b/lxd/instance_delete.go
index 963b31f20f..8e17906637 100644
--- a/lxd/instance_delete.go
+++ b/lxd/instance_delete.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
 )
 
 func containerDelete(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_exec.go b/lxd/instance_exec.go
index 76db1bfaee..cbd7c339ea 100644
--- a/lxd/instance_exec.go
+++ b/lxd/instance_exec.go
@@ -15,20 +15,20 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/netutils"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/netutils"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type execWs struct {
diff --git a/lxd/instance_file.go b/lxd/instance_file.go
index 62265d8964..a9aa067d56 100644
--- a/lxd/instance_file.go
+++ b/lxd/instance_file.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
 )
 
 func containerFileHandler(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_get.go b/lxd/instance_get.go
index ca615bc470..107d5d5c2e 100644
--- a/lxd/instance_get.go
+++ b/lxd/instance_get.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/response"
 )
 
 func containerGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go
index b1c5e286ea..715b7e23dc 100644
--- a/lxd/instance_instance_types.go
+++ b/lxd/instance_instance_types.go
@@ -10,15 +10,15 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
-
-	log "github.com/lxc/lxd/shared/log15"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
+
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 type instanceType struct {
diff --git a/lxd/instance_logs.go b/lxd/instance_logs.go
index c63fb5afde..97b6c66c8b 100644
--- a/lxd/instance_logs.go
+++ b/lxd/instance_logs.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var instanceLogCmd = APIEndpoint{
diff --git a/lxd/instance_metadata.go b/lxd/instance_metadata.go
index 4d15a40869..a9d3b6f659 100644
--- a/lxd/instance_metadata.go
+++ b/lxd/instance_metadata.go
@@ -13,11 +13,11 @@ import (
 	"github.com/gorilla/mux"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/response"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/response"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func containerMetadataGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_patch.go b/lxd/instance_patch.go
index af4cacf31a..5468db3f0f 100644
--- a/lxd/instance_patch.go
+++ b/lxd/instance_patch.go
@@ -9,15 +9,15 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	projecthelpers "github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	projecthelpers "github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 func containerPatch(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_post.go b/lxd/instance_post.go
index 218602a6b2..d2197b1303 100644
--- a/lxd/instance_post.go
+++ b/lxd/instance_post.go
@@ -11,19 +11,19 @@ import (
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	driver "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	driver "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var internalClusterContainerMovedCmd = APIEndpoint{
diff --git a/lxd/instance_put.go b/lxd/instance_put.go
index 5390756615..482b9fe899 100644
--- a/lxd/instance_put.go
+++ b/lxd/instance_put.go
@@ -7,17 +7,17 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	projecthelpers "github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	projecthelpers "github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 /*
diff --git a/lxd/instance_snapshot.go b/lxd/instance_snapshot.go
index e54c90f741..2bdb5c140f 100644
--- a/lxd/instance_snapshot.go
+++ b/lxd/instance_snapshot.go
@@ -12,18 +12,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/validate"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 func containerSnapshotsGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_state.go b/lxd/instance_state.go
index dfcb4b15be..478f8ae441 100644
--- a/lxd/instance_state.go
+++ b/lxd/instance_state.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func containerState(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_test.go b/lxd/instance_test.go
index 602079a4f8..0dd5d320ba 100644
--- a/lxd/instance_test.go
+++ b/lxd/instance_test.go
@@ -6,16 +6,16 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	driver "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	instanceDrivers "github.com/grant-he/lxd/lxd/instance/drivers"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	driver "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
 )
 
 type containerTestSuite struct {
diff --git a/lxd/instances.go b/lxd/instances.go
index 9bb2272725..fe865e7944 100644
--- a/lxd/instances.go
+++ b/lxd/instances.go
@@ -8,13 +8,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var instancesCmd = APIEndpoint{
diff --git a/lxd/instances_get.go b/lxd/instances_get.go
index eb503044e7..025e0bcda7 100644
--- a/lxd/instances_get.go
+++ b/lxd/instances_get.go
@@ -12,17 +12,17 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/filter"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/filter"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // urlInstanceTypeDetect detects what sort of instance type filter is being requested. Either
diff --git a/lxd/instances_post.go b/lxd/instances_post.go
index 3a7028a1de..521a802216 100644
--- a/lxd/instances_post.go
+++ b/lxd/instances_post.go
@@ -15,22 +15,22 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	projecthelpers "github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/revert"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	projecthelpers "github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/revert"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 func createFromImage(d *Daemon, project string, req *api.InstancesPost) response.Response {
diff --git a/lxd/logging.go b/lxd/logging.go
index 6b8d5f1918..761fd38c47 100644
--- a/lxd/logging.go
+++ b/lxd/logging.go
@@ -7,17 +7,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-
-	log "github.com/lxc/lxd/shared/log15"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
+
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // This task function expires logs when executed. It's started by the Daemon
diff --git a/lxd/maas/controller.go b/lxd/maas/controller.go
index 15465afc61..1f20e51809 100644
--- a/lxd/maas/controller.go
+++ b/lxd/maas/controller.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/juju/gomaasapi"
 
-	"github.com/lxc/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/project"
 )
 
 // Instance is a MAAS specific instance interface.
diff --git a/lxd/main.go b/lxd/main.go
index f8c3f83dba..0f33a9da5f 100644
--- a/lxd/main.go
+++ b/lxd/main.go
@@ -8,14 +8,14 @@ import (
 	"github.com/canonical/go-dqlite"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/events"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/events"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Initialize the random number generator
diff --git a/lxd/main_activateifneeded.go b/lxd/main_activateifneeded.go
index a9142c4ab3..c81b23c24c 100644
--- a/lxd/main_activateifneeded.go
+++ b/lxd/main_activateifneeded.go
@@ -8,14 +8,14 @@ import (
 	sqlite3 "github.com/mattn/go-sqlite3"
 	"github.com/spf13/cobra"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func init() {
diff --git a/lxd/main_callhook.go b/lxd/main_callhook.go
index 84390f87ec..ea2f753732 100644
--- a/lxd/main_callhook.go
+++ b/lxd/main_callhook.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
+	"github.com/grant-he/lxd/client"
 )
 
 type cmdCallhook struct {
diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go
index 30e352014f..acf210c1fd 100644
--- a/lxd/main_checkfeature.go
+++ b/lxd/main_checkfeature.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"runtime"
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 /*
diff --git a/lxd/main_cluster.go b/lxd/main_cluster.go
index e15b218ad9..f01dfdc1db 100644
--- a/lxd/main_cluster.go
+++ b/lxd/main_cluster.go
@@ -7,13 +7,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxc/utils"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxc/utils"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/lxd/main_daemon.go b/lxd/main_daemon.go
index 99ad98ea53..17eeb6af24 100644
--- a/lxd/main_daemon.go
+++ b/lxd/main_daemon.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type cmdDaemon struct {
diff --git a/lxd/main_forkdns.go b/lxd/main_forkdns.go
index 69406b7ff4..cce87856d7 100644
--- a/lxd/main_forkdns.go
+++ b/lxd/main_forkdns.go
@@ -14,11 +14,11 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/fsnotify.v0"
 
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/dnsutil"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/dnsutil"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 type cmdForkDNS struct {
diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go
index 96a5fa4ede..fe095dd769 100644
--- a/lxd/main_forkexec.go
+++ b/lxd/main_forkexec.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forkmount.go b/lxd/main_forkmount.go
index 27440000f9..01c9660c40 100644
--- a/lxd/main_forkmount.go
+++ b/lxd/main_forkmount.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forknet.go b/lxd/main_forknet.go
index c37ec992d9..8ad5b5d298 100644
--- a/lxd/main_forknet.go
+++ b/lxd/main_forknet.go
@@ -7,9 +7,9 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 
-	"github.com/lxc/lxd/shared/netutils"
+	"github.com/grant-he/lxd/shared/netutils"
 )
 
 /*
@@ -117,7 +117,7 @@ void forknet(void)
 }
 */
 import "C"
-import "github.com/lxc/lxd/shared"
+import "github.com/grant-he/lxd/shared"
 
 type cmdForknet struct {
 	global *cmdGlobal
diff --git a/lxd/main_forkproxy.go b/lxd/main_forkproxy.go
index 81d034b9fa..bcb95bf7f4 100644
--- a/lxd/main_forkproxy.go
+++ b/lxd/main_forkproxy.go
@@ -16,13 +16,13 @@ import (
 	"golang.org/x/sys/unix"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/device"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/netutils"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/device"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/netutils"
 )
 
 /*
diff --git a/lxd/main_forkproxy_test.go b/lxd/main_forkproxy_test.go
index dac9682d5a..8b6966ef29 100644
--- a/lxd/main_forkproxy_test.go
+++ b/lxd/main_forkproxy_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/lxd/lxd/device"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
 )
 
 func TestParseAddr(t *testing.T) {
diff --git a/lxd/main_forkstart.go b/lxd/main_forkstart.go
index c2707811bf..8d5db157be 100644
--- a/lxd/main_forkstart.go
+++ b/lxd/main_forkstart.go
@@ -8,7 +8,7 @@ import (
 	"golang.org/x/sys/unix"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 type cmdForkstart struct {
diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
index be2839f2a0..aef1095019 100644
--- a/lxd/main_forksyscall.go
+++ b/lxd/main_forksyscall.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forkzfs.go b/lxd/main_forkzfs.go
index 3ce0e06863..d06aa6fe7b 100644
--- a/lxd/main_forkzfs.go
+++ b/lxd/main_forkzfs.go
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 type cmdForkZFS struct {
diff --git a/lxd/main_import.go b/lxd/main_import.go
index 46716805c3..a6db1f668b 100644
--- a/lxd/main_import.go
+++ b/lxd/main_import.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
+	"github.com/grant-he/lxd/client"
 )
 
 type cmdImport struct {
diff --git a/lxd/main_init.go b/lxd/main_init.go
index ca0bcb8eb7..534c0b3c16 100644
--- a/lxd/main_init.go
+++ b/lxd/main_init.go
@@ -6,13 +6,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/sys"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
 )
 
 type cmdInitData struct {
diff --git a/lxd/main_init_auto.go b/lxd/main_init_auto.go
index d19fee6a8e..025f51c548 100644
--- a/lxd/main_init_auto.go
+++ b/lxd/main_init_auto.go
@@ -6,12 +6,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/project"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/project"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func (c *cmdInit) RunAuto(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) {
diff --git a/lxd/main_init_dump.go b/lxd/main_init_dump.go
index 835b7b9d8c..57ce55e19b 100644
--- a/lxd/main_init_dump.go
+++ b/lxd/main_init_dump.go
@@ -6,9 +6,9 @@ import (
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/shared/api"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func (c *cmdInit) RunDump(d lxd.InstanceServer) error {
diff --git a/lxd/main_init_interactive.go b/lxd/main_init_interactive.go
index dfc8f0c0de..889c59e6c2 100644
--- a/lxd/main_init_interactive.go
+++ b/lxd/main_init_interactive.go
@@ -15,17 +15,17 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/validate"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 func (c *cmdInit) RunInteractive(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) {
diff --git a/lxd/main_init_preseed.go b/lxd/main_init_preseed.go
index c6b5349494..4708b1fb25 100644
--- a/lxd/main_init_preseed.go
+++ b/lxd/main_init_preseed.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/client"
+	"github.com/grant-he/lxd/client"
 )
 
 func (c *cmdInit) RunPreseed(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) {
diff --git a/lxd/main_manpage.go b/lxd/main_manpage.go
index 4860d3ed95..e0762f3f58 100644
--- a/lxd/main_manpage.go
+++ b/lxd/main_manpage.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	cli "github.com/lxc/lxd/shared/cmd"
+	cli "github.com/grant-he/lxd/shared/cmd"
 )
 
 type cmdManpage struct {
diff --git a/lxd/main_migratedumpsuccess.go b/lxd/main_migratedumpsuccess.go
index de87f4b3be..c8d79f7a80 100644
--- a/lxd/main_migratedumpsuccess.go
+++ b/lxd/main_migratedumpsuccess.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type cmdMigratedumpsuccess struct {
diff --git a/lxd/main_netcat.go b/lxd/main_netcat.go
index aec3c102bc..25281f1401 100644
--- a/lxd/main_netcat.go
+++ b/lxd/main_netcat.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/eagain"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/eagain"
 )
 
 type cmdNetcat struct {
diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go
index 3bfe019832..6f6928ef1e 100644
--- a/lxd/main_nsexec.go
+++ b/lxd/main_nsexec.go
@@ -20,7 +20,7 @@ package main
 
 import (
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_shutdown.go b/lxd/main_shutdown.go
index dde6e493b6..62e5b1d61b 100644
--- a/lxd/main_shutdown.go
+++ b/lxd/main_shutdown.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
+	"github.com/grant-he/lxd/client"
 )
 
 type cmdShutdown struct {
diff --git a/lxd/main_sql.go b/lxd/main_sql.go
index a6ee638a5a..0e97b7cb95 100644
--- a/lxd/main_sql.go
+++ b/lxd/main_sql.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared"
 )
 
 type cmdSql struct {
diff --git a/lxd/main_test.go b/lxd/main_test.go
index 0e255ad60a..051c7152ee 100644
--- a/lxd/main_test.go
+++ b/lxd/main_test.go
@@ -5,14 +5,14 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/sys"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
 )
 
 func mockStartDaemon() (*Daemon, error) {
diff --git a/lxd/main_version.go b/lxd/main_version.go
index 9396b336e9..ba7dfa4d7c 100644
--- a/lxd/main_version.go
+++ b/lxd/main_version.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cli "github.com/lxc/lxd/shared/cmd"
-	"github.com/lxc/lxd/shared/version"
+	cli "github.com/grant-he/lxd/shared/cmd"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 type cmdVersion struct {
diff --git a/lxd/main_waitready.go b/lxd/main_waitready.go
index da9caca5d6..be100a323d 100644
--- a/lxd/main_waitready.go
+++ b/lxd/main_waitready.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type cmdWaitready struct {
diff --git a/lxd/migrate.go b/lxd/migrate.go
index 7acefe4ce1..02896f481c 100644
--- a/lxd/migrate.go
+++ b/lxd/migrate.go
@@ -18,12 +18,12 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type migrationFields struct {
diff --git a/lxd/migrate_instance.go b/lxd/migrate_instance.go
index e55969a02a..887d2e0829 100644
--- a/lxd/migrate_instance.go
+++ b/lxd/migrate_instance.go
@@ -16,19 +16,19 @@ import (
 	"github.com/pkg/errors"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func newMigrationSource(inst instance.Instance, stateful bool, instanceOnly bool) (*migrationSourceWs, error) {
diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go
index cb28c506a6..eb86dc9335 100644
--- a/lxd/migrate_storage_volumes.go
+++ b/lxd/migrate_storage_volumes.go
@@ -6,14 +6,14 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func newStorageMigrationSource(volumeOnly bool) (*migrationSourceWs, error) {
diff --git a/lxd/migration/migration_volumes.go b/lxd/migration/migration_volumes.go
index 1aa186332f..23029fcce2 100644
--- a/lxd/migration/migration_volumes.go
+++ b/lxd/migration/migration_volumes.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // Type represents the migration transport type. It indicates the method by which the migration can
diff --git a/lxd/migration/wsproto.go b/lxd/migration/wsproto.go
index 7ba37b29fb..43a8a335f8 100644
--- a/lxd/migration/wsproto.go
+++ b/lxd/migration/wsproto.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // ProtoRecv gets a protobuf message from a websocket
diff --git a/lxd/network/driver_bridge.go b/lxd/network/driver_bridge.go
index ec30df98ca..9c3606c182 100644
--- a/lxd/network/driver_bridge.go
+++ b/lxd/network/driver_bridge.go
@@ -18,22 +18,22 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/apparmor"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/daemon"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/dnsmasq"
-	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
-	"github.com/lxc/lxd/lxd/network/openvswitch"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/subprocess"
-	"github.com/lxc/lxd/shared/validate"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/apparmor"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/daemon"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/dnsmasq"
+	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
+	"github.com/grant-he/lxd/lxd/network/openvswitch"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/subprocess"
+	"github.com/grant-he/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // ForkdnsServersListPath defines the path that contains the forkdns server candidate file.
diff --git a/lxd/network/driver_common.go b/lxd/network/driver_common.go
index 23cff9a58c..b31b182b52 100644
--- a/lxd/network/driver_common.go
+++ b/lxd/network/driver_common.go
@@ -8,16 +8,16 @@ import (
 
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/validate"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // Info represents information about a network driver.
diff --git a/lxd/network/driver_macvlan.go b/lxd/network/driver_macvlan.go
index 09c15a174f..0486569132 100644
--- a/lxd/network/driver_macvlan.go
+++ b/lxd/network/driver_macvlan.go
@@ -3,12 +3,12 @@ package network
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // macvlan represents a LXD macvlan network.
diff --git a/lxd/network/driver_ovn.go b/lxd/network/driver_ovn.go
index 950ac04be9..af2794d046 100644
--- a/lxd/network/driver_ovn.go
+++ b/lxd/network/driver_ovn.go
@@ -15,19 +15,19 @@ import (
 	"github.com/mdlayher/netx/eui64"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/locking"
-	"github.com/lxc/lxd/lxd/network/openvswitch"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/locking"
+	"github.com/grant-he/lxd/lxd/network/openvswitch"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 const ovnChassisPriorityMax = 32767
diff --git a/lxd/network/driver_physical.go b/lxd/network/driver_physical.go
index 3d24584924..590eb741aa 100644
--- a/lxd/network/driver_physical.go
+++ b/lxd/network/driver_physical.go
@@ -6,14 +6,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // physical represents a LXD physical network.
diff --git a/lxd/network/driver_sriov.go b/lxd/network/driver_sriov.go
index 299e2dd2df..3f341917b8 100644
--- a/lxd/network/driver_sriov.go
+++ b/lxd/network/driver_sriov.go
@@ -3,12 +3,12 @@ package network
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // sriov represents a LXD sriov network.
diff --git a/lxd/network/network_interface.go b/lxd/network/network_interface.go
index b9ba1e89d1..fb0cd33e69 100644
--- a/lxd/network/network_interface.go
+++ b/lxd/network/network_interface.go
@@ -3,11 +3,11 @@ package network
 import (
 	"net"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Type represents an LXD network driver type.
diff --git a/lxd/network/network_load.go b/lxd/network/network_load.go
index 7098181a57..219a783665 100644
--- a/lxd/network/network_load.go
+++ b/lxd/network/network_load.go
@@ -1,7 +1,7 @@
 package network
 
 import (
-	"github.com/lxc/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/state"
 )
 
 var drivers = map[string]func() Network{
diff --git a/lxd/network/network_utils.go b/lxd/network/network_utils.go
index 54793215d2..7c57b48ec5 100644
--- a/lxd/network/network_utils.go
+++ b/lxd/network/network_utils.go
@@ -18,20 +18,20 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/dnsmasq"
-	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/dnsmasq"
+	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // validInterfaceName validates a real network interface name.
diff --git a/lxd/network/network_utils_bridge.go b/lxd/network/network_utils_bridge.go
index f19b313e8d..ba1d68deef 100644
--- a/lxd/network/network_utils_bridge.go
+++ b/lxd/network/network_utils_bridge.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/network/openvswitch"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/network/openvswitch"
+	"github.com/grant-he/lxd/shared"
 )
 
 // BridgeVLANFilteringStatus returns whether VLAN filtering is enabled on a bridge interface.
diff --git a/lxd/network/openvswitch/ovn.go b/lxd/network/openvswitch/ovn.go
index 643e6d7047..acb49a1228 100644
--- a/lxd/network/openvswitch/ovn.go
+++ b/lxd/network/openvswitch/ovn.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // OVNRouter OVN router name.
diff --git a/lxd/network/openvswitch/ovs.go b/lxd/network/openvswitch/ovs.go
index 478d9325aa..2f110fe849 100644
--- a/lxd/network/openvswitch/ovs.go
+++ b/lxd/network/openvswitch/ovs.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // ovnBridgeMappingMutex locks access to read/write external-ids:ovn-bridge-mappings.
diff --git a/lxd/networks.go b/lxd/networks.go
index 09ea358629..e98f3c70a0 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -12,25 +12,25 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/device/nictype"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/network/openvswitch"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/device/nictype"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/network/openvswitch"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Lock to prevent concurent networks creation
diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index dc8e834353..ea72336827 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -8,14 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/network"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/network"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func readUint(path string) (uint64, error) {
diff --git a/lxd/node/config.go b/lxd/node/config.go
index 2756f7601c..bc1ff64c63 100644
--- a/lxd/node/config.go
+++ b/lxd/node/config.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/lxc/lxd/lxd/config"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/config"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/node/config_test.go b/lxd/node/config_test.go
index fb20433f97..e7b5408163 100644
--- a/lxd/node/config_test.go
+++ b/lxd/node/config_test.go
@@ -3,8 +3,8 @@ package node_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/node/raft.go b/lxd/node/raft.go
index a6c34b8656..cf5e36f9f0 100644
--- a/lxd/node/raft.go
+++ b/lxd/node/raft.go
@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 // DetermineRaftNode figures out what raft node ID and address we have, if any.
diff --git a/lxd/node/raft_test.go b/lxd/node/raft_test.go
index 88bfacccd1..6d8f0aaa56 100644
--- a/lxd/node/raft_test.go
+++ b/lxd/node/raft_test.go
@@ -3,8 +3,8 @@ package node_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/operations.go b/lxd/operations.go
index b46427f1cf..fbd7ffb680 100644
--- a/lxd/operations.go
+++ b/lxd/operations.go
@@ -9,17 +9,17 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var operationCmd = APIEndpoint{
diff --git a/lxd/operations/linux.go b/lxd/operations/linux.go
index 10005a57ec..285b9df6a2 100644
--- a/lxd/operations/linux.go
+++ b/lxd/operations/linux.go
@@ -5,7 +5,7 @@ package operations
 import (
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 func registerDBOperation(op *Operation, opType db.OperationType) error {
diff --git a/lxd/operations/notlinux.go b/lxd/operations/notlinux.go
index 0c0d00b401..96bc87df90 100644
--- a/lxd/operations/notlinux.go
+++ b/lxd/operations/notlinux.go
@@ -5,7 +5,7 @@ package operations
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 func registerDBOperation(op *Operation, opType db.OperationType) error {
diff --git a/lxd/operations/operations.go b/lxd/operations/operations.go
index 7067bcebb1..310227781e 100644
--- a/lxd/operations/operations.go
+++ b/lxd/operations/operations.go
@@ -9,15 +9,15 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/events"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/events"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var debug bool
diff --git a/lxd/operations/response.go b/lxd/operations/response.go
index d22c5b9f6a..1909da358f 100644
--- a/lxd/operations/response.go
+++ b/lxd/operations/response.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Operation response
diff --git a/lxd/operations/websocket.go b/lxd/operations/websocket.go
index f16005da85..8bb5447e13 100644
--- a/lxd/operations/websocket.go
+++ b/lxd/operations/websocket.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/websocket"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/shared"
 )
 
 type operationWebSocket struct {
diff --git a/lxd/patches.go b/lxd/patches.go
index ef0bbee33c..7cfb8a079b 100644
--- a/lxd/patches.go
+++ b/lxd/patches.go
@@ -15,22 +15,22 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/db/query"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/rsync"
-	driver "github.com/lxc/lxd/lxd/storage"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/rsync"
+	driver "github.com/grant-he/lxd/lxd/storage"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type patchStage int
diff --git a/lxd/patches_utils.go b/lxd/patches_utils.go
index 256422f32e..9948fe1d08 100644
--- a/lxd/patches_utils.go
+++ b/lxd/patches_utils.go
@@ -10,11 +10,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // For 'btrfs' storage backend.
diff --git a/lxd/profiles.go b/lxd/profiles.go
index 2cba1eefa7..456c6ec033 100644
--- a/lxd/profiles.go
+++ b/lxd/profiles.go
@@ -11,18 +11,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var profilesCmd = APIEndpoint{
diff --git a/lxd/profiles_utils.go b/lxd/profiles_utils.go
index 2a6aa30700..6c6d5061fa 100644
--- a/lxd/profiles_utils.go
+++ b/lxd/profiles_utils.go
@@ -3,13 +3,13 @@ package main
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	projecthelpers "github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	projecthelpers "github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/project/permissions.go b/lxd/project/permissions.go
index 3950396bb6..5fc88c6951 100644
--- a/lxd/project/permissions.go
+++ b/lxd/project/permissions.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceconfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceconfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // AllowInstanceCreation returns an error if any project-specific limit or
diff --git a/lxd/project/permissions_test.go b/lxd/project/permissions_test.go
index ccede05630..6032becea2 100644
--- a/lxd/project/permissions_test.go
+++ b/lxd/project/permissions_test.go
@@ -3,10 +3,10 @@ package project_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/project/project.go b/lxd/project/project.go
index 202f059650..8934f1bd63 100644
--- a/lxd/project/project.go
+++ b/lxd/project/project.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // Default is the string used for a default project.
diff --git a/lxd/project/project_test.go b/lxd/project/project_test.go
index 43532a9f3b..c319d6fc54 100644
--- a/lxd/project/project_test.go
+++ b/lxd/project/project_test.go
@@ -3,7 +3,7 @@ package project_test
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/project"
 )
 
 func ExampleInstance() {
diff --git a/lxd/rbac/server.go b/lxd/rbac/server.go
index 4259c0fa8e..51f7e5aa1b 100644
--- a/lxd/rbac/server.go
+++ b/lxd/rbac/server.go
@@ -18,8 +18,8 @@ import (
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery/agent"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type rbacResource struct {
diff --git a/lxd/resources.go b/lxd/resources.go
index 620deecdfa..15824d4963 100644
--- a/lxd/resources.go
+++ b/lxd/resources.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/lxc/lxd/lxd/resources"
-	"github.com/lxc/lxd/lxd/response"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/resources"
+	"github.com/grant-he/lxd/lxd/response"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var api10ResourcesCmd = APIEndpoint{
diff --git a/lxd/resources/cpu.go b/lxd/resources/cpu.go
index 70536f29f6..1c220ca63d 100644
--- a/lxd/resources/cpu.go
+++ b/lxd/resources/cpu.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var sysDevicesCPU = "/sys/devices/system/cpu"
diff --git a/lxd/resources/gpu.go b/lxd/resources/gpu.go
index 0c9d260ed6..873c990cd3 100644
--- a/lxd/resources/gpu.go
+++ b/lxd/resources/gpu.go
@@ -16,7 +16,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var sysClassDrm = "/sys/class/drm"
diff --git a/lxd/resources/memory.go b/lxd/resources/memory.go
index 8fae70d2ac..223325a882 100644
--- a/lxd/resources/memory.go
+++ b/lxd/resources/memory.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 var sysDevicesNode = "/sys/devices/system/node"
diff --git a/lxd/resources/network.go b/lxd/resources/network.go
index 3ab64405be..5ce9c7da81 100644
--- a/lxd/resources/network.go
+++ b/lxd/resources/network.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var sysClassNet = "/sys/class/net"
diff --git a/lxd/resources/network_ethtool.go b/lxd/resources/network_ethtool.go
index 1938cc8afe..3d5011e1a5 100644
--- a/lxd/resources/network_ethtool.go
+++ b/lxd/resources/network_ethtool.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type ethtoolReq struct {
diff --git a/lxd/resources/pci.go b/lxd/resources/pci.go
index 69c95e0bed..cb73286504 100644
--- a/lxd/resources/pci.go
+++ b/lxd/resources/pci.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // GetPCI returns a filled api.ResourcesPCI struct ready for use by LXD
diff --git a/lxd/resources/resources.go b/lxd/resources/resources.go
index c35f8876eb..415da6c965 100644
--- a/lxd/resources/resources.go
+++ b/lxd/resources/resources.go
@@ -3,7 +3,7 @@ package resources
 import (
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 // GetResources returns a filled api.Resources struct ready for use by LXD
diff --git a/lxd/resources/storage.go b/lxd/resources/storage.go
index b051957f76..0c89ad38ef 100644
--- a/lxd/resources/storage.go
+++ b/lxd/resources/storage.go
@@ -12,7 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var devDiskByPath = "/dev/disk/by-path"
diff --git a/lxd/resources/system.go b/lxd/resources/system.go
index a074b54888..9db4ac24bf 100644
--- a/lxd/resources/system.go
+++ b/lxd/resources/system.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var sysClassDMIID = "/sys/class/dmi/id"
diff --git a/lxd/resources/usb.go b/lxd/resources/usb.go
index fc88c459dc..69ee37a811 100644
--- a/lxd/resources/usb.go
+++ b/lxd/resources/usb.go
@@ -9,8 +9,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/usbid"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/usbid"
 )
 
 var sysBusUSB = "/sys/bus/usb/devices"
diff --git a/lxd/response.go b/lxd/response.go
index c511dca9a8..424c925ae5 100644
--- a/lxd/response.go
+++ b/lxd/response.go
@@ -3,9 +3,9 @@ package main
 import (
 	"net/http"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/response"
 )
 
 // forwardedResponseIfTargetIsRemote redirects a request to the request has a
diff --git a/lxd/response/response.go b/lxd/response/response.go
index 302c4eae09..ac2a417d30 100644
--- a/lxd/response/response.go
+++ b/lxd/response/response.go
@@ -10,10 +10,10 @@ import (
 	"os"
 	"time"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 var debug bool
diff --git a/lxd/response/smart.go b/lxd/response/smart.go
index 95953513e5..43c35a7a6c 100644
--- a/lxd/response/smart.go
+++ b/lxd/response/smart.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 )
 
 // SmartError returns the right error message based on err.
diff --git a/lxd/response/smart_linux.go b/lxd/response/smart_linux.go
index 96c8750528..e40ca68720 100644
--- a/lxd/response/smart_linux.go
+++ b/lxd/response/smart_linux.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/lxc/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/db"
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 )
diff --git a/lxd/revert/revert_test.go b/lxd/revert/revert_test.go
index 20b0fefb7b..e0206c8162 100644
--- a/lxd/revert/revert_test.go
+++ b/lxd/revert/revert_test.go
@@ -3,7 +3,7 @@ package revert_test
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/revert"
 )
 
 func ExampleReverter_fail() {
diff --git a/lxd/rsync/rsync.go b/lxd/rsync/rsync.go
index 17dc94e9d4..1e3ae46242 100644
--- a/lxd/rsync/rsync.go
+++ b/lxd/rsync/rsync.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Debug controls additional debugging in rsync output.
diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
index 90be41223e..892ac8e36f 100644
--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
@@ -21,19 +21,19 @@ import (
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
-
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/ucred"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/netutils"
-	"github.com/lxc/lxd/shared/osarch"
+	_ "github.com/grant-he/lxd/lxd/include"
+
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/ucred"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/netutils"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 /*
diff --git a/lxd/state/notlinux.go b/lxd/state/notlinux.go
index bf769cac54..6706f8e753 100644
--- a/lxd/state/notlinux.go
+++ b/lxd/state/notlinux.go
@@ -5,7 +5,7 @@ package state
 import (
 	"context"
 
-	"github.com/lxc/lxd/lxd/events"
+	"github.com/grant-he/lxd/lxd/events"
 )
 
 // State here is just an empty shim to statisfy dependencies.
diff --git a/lxd/state/state.go b/lxd/state/state.go
index 76805314c6..0deeaa8fb0 100644
--- a/lxd/state/state.go
+++ b/lxd/state/state.go
@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/endpoints"
-	"github.com/lxc/lxd/lxd/events"
-	"github.com/lxc/lxd/lxd/firewall"
-	"github.com/lxc/lxd/lxd/maas"
-	"github.com/lxc/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/endpoints"
+	"github.com/grant-he/lxd/lxd/events"
+	"github.com/grant-he/lxd/lxd/firewall"
+	"github.com/grant-he/lxd/lxd/maas"
+	"github.com/grant-he/lxd/lxd/sys"
 )
 
 // State is a gateway to the two main stateful components of LXD, the database
diff --git a/lxd/state/testing.go b/lxd/state/testing.go
index 5f9e81eea4..6999b4291d 100644
--- a/lxd/state/testing.go
+++ b/lxd/state/testing.go
@@ -6,9 +6,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/firewall"
-	"github.com/lxc/lxd/lxd/sys"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/firewall"
+	"github.com/grant-he/lxd/lxd/sys"
 )
 
 // NewTestState returns a State object initialized with testable instances of
diff --git a/lxd/storage.go b/lxd/storage.go
index 0b627bc2ea..da8a80e6f2 100644
--- a/lxd/storage.go
+++ b/lxd/storage.go
@@ -8,15 +8,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Simply cache used to storage the activated drivers on this LXD instance. This
diff --git a/lxd/storage/backend_lxd.go b/lxd/storage/backend_lxd.go
index c1b63dad58..315442de90 100644
--- a/lxd/storage/backend_lxd.go
+++ b/lxd/storage/backend_lxd.go
@@ -12,25 +12,25 @@ import (
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/locking"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/lxd/storage/memorypipe"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/locking"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/lxd/storage/memorypipe"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 type lxdBackend struct {
diff --git a/lxd/storage/backend_lxd_patches.go b/lxd/storage/backend_lxd_patches.go
index 5d58fa83e5..470f1a32e4 100644
--- a/lxd/storage/backend_lxd_patches.go
+++ b/lxd/storage/backend_lxd_patches.go
@@ -6,13 +6,13 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var lxdEarlyPatches = map[string]func(b *lxdBackend) error{}
diff --git a/lxd/storage/backend_mock.go b/lxd/storage/backend_mock.go
index bfc443fa29..03de89c8cf 100644
--- a/lxd/storage/backend_mock.go
+++ b/lxd/storage/backend_mock.go
@@ -4,15 +4,15 @@ import (
 	"io"
 	"time"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type mockBackend struct {
diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go
index bbf1dd6280..b30cb5a830 100644
--- a/lxd/storage/drivers/driver_btrfs.go
+++ b/lxd/storage/drivers/driver_btrfs.go
@@ -10,13 +10,13 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 var btrfsVersion string
diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go
index e1a359e849..cadb839e6c 100644
--- a/lxd/storage/drivers/driver_btrfs_utils.go
+++ b/lxd/storage/drivers/driver_btrfs_utils.go
@@ -15,10 +15,10 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Errors
diff --git a/lxd/storage/drivers/driver_btrfs_volumes.go b/lxd/storage/drivers/driver_btrfs_volumes.go
index edc331cf00..cc956e8bd7 100644
--- a/lxd/storage/drivers/driver_btrfs_volumes.go
+++ b/lxd/storage/drivers/driver_btrfs_volumes.go
@@ -15,15 +15,15 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function.
diff --git a/lxd/storage/drivers/driver_ceph.go b/lxd/storage/drivers/driver_ceph.go
index 111d44239c..ac8ac7d356 100644
--- a/lxd/storage/drivers/driver_ceph.go
+++ b/lxd/storage/drivers/driver_ceph.go
@@ -7,14 +7,14 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 var cephAllowedFilesystems = []string{"btrfs", "ext4", "xfs"}
diff --git a/lxd/storage/drivers/driver_ceph_utils.go b/lxd/storage/drivers/driver_ceph_utils.go
index 9d8f2590da..3c90ee5c3f 100644
--- a/lxd/storage/drivers/driver_ceph_utils.go
+++ b/lxd/storage/drivers/driver_ceph_utils.go
@@ -14,11 +14,11 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 const cephVolumeTypeZombieImage = VolumeType("zombie_image")
diff --git a/lxd/storage/drivers/driver_ceph_volumes.go b/lxd/storage/drivers/driver_ceph_volumes.go
index 812dd998d3..a15f43b11d 100644
--- a/lxd/storage/drivers/driver_ceph_volumes.go
+++ b/lxd/storage/drivers/driver_ceph_volumes.go
@@ -11,17 +11,17 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied
diff --git a/lxd/storage/drivers/driver_cephfs.go b/lxd/storage/drivers/driver_cephfs.go
index 29988cfc85..94270f98f0 100644
--- a/lxd/storage/drivers/driver_cephfs.go
+++ b/lxd/storage/drivers/driver_cephfs.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 var cephfsVersion string
diff --git a/lxd/storage/drivers/driver_cephfs_utils.go b/lxd/storage/drivers/driver_cephfs_utils.go
index ada9f2e5a8..19a4daf127 100644
--- a/lxd/storage/drivers/driver_cephfs_utils.go
+++ b/lxd/storage/drivers/driver_cephfs_utils.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // fsExists checks that the Ceph FS instance indeed exists.
diff --git a/lxd/storage/drivers/driver_cephfs_volumes.go b/lxd/storage/drivers/driver_cephfs_volumes.go
index c5c28cb054..c610970fa1 100644
--- a/lxd/storage/drivers/driver_cephfs_volumes.go
+++ b/lxd/storage/drivers/driver_cephfs_volumes.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // CreateVolume creates a new storage volume on disk.
diff --git a/lxd/storage/drivers/driver_common.go b/lxd/storage/drivers/driver_common.go
index e15950acad..d638f7e318 100644
--- a/lxd/storage/drivers/driver_common.go
+++ b/lxd/storage/drivers/driver_common.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type common struct {
diff --git a/lxd/storage/drivers/driver_dir.go b/lxd/storage/drivers/driver_dir.go
index df9023823e..0ae9769072 100644
--- a/lxd/storage/drivers/driver_dir.go
+++ b/lxd/storage/drivers/driver_dir.go
@@ -7,9 +7,9 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 type dir struct {
diff --git a/lxd/storage/drivers/driver_dir_utils.go b/lxd/storage/drivers/driver_dir_utils.go
index 5badee6c3f..ded28e8927 100644
--- a/lxd/storage/drivers/driver_dir_utils.go
+++ b/lxd/storage/drivers/driver_dir_utils.go
@@ -3,10 +3,10 @@ package drivers
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/storage/quota"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/storage/quota"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // withoutGetVolID returns a copy of this struct but with a volIDFunc which will cause quotas to be skipped.
diff --git a/lxd/storage/drivers/driver_dir_volumes.go b/lxd/storage/drivers/driver_dir_volumes.go
index b0ffca80f1..10882c5026 100644
--- a/lxd/storage/drivers/driver_dir_volumes.go
+++ b/lxd/storage/drivers/driver_dir_volumes.go
@@ -7,15 +7,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/lxd/storage/quota"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/lxd/storage/quota"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied
diff --git a/lxd/storage/drivers/driver_lvm.go b/lxd/storage/drivers/driver_lvm.go
index 75fe9f0476..d61cfb93a3 100644
--- a/lxd/storage/drivers/driver_lvm.go
+++ b/lxd/storage/drivers/driver_lvm.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 const lvmVgPoolMarker = "lxd_pool" // Indicator tag used to mark volume groups as in use by LXD.
diff --git a/lxd/storage/drivers/driver_lvm_patches.go b/lxd/storage/drivers/driver_lvm_patches.go
index 082aedbafe..649ddb8a4f 100644
--- a/lxd/storage/drivers/driver_lvm_patches.go
+++ b/lxd/storage/drivers/driver_lvm_patches.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // patchStorageSkipActivation set skipactivation=y on all LXD LVM logical volumes (excluding thin pool volumes).
diff --git a/lxd/storage/drivers/driver_lvm_utils.go b/lxd/storage/drivers/driver_lvm_utils.go
index 9d4b2bed68..fb36cd930f 100644
--- a/lxd/storage/drivers/driver_lvm_utils.go
+++ b/lxd/storage/drivers/driver_lvm_utils.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/locking"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/locking"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // lvmBlockVolSuffix suffix used for block content type svolumes.
diff --git a/lxd/storage/drivers/driver_lvm_volumes.go b/lxd/storage/drivers/driver_lvm_volumes.go
index dde586d978..ef5b1f9b2f 100644
--- a/lxd/storage/drivers/driver_lvm_volumes.go
+++ b/lxd/storage/drivers/driver_lvm_volumes.go
@@ -13,15 +13,15 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/instancewriter"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function.
diff --git a/lxd/storage/drivers/driver_zfs.go b/lxd/storage/drivers/driver_zfs.go
index 31c4f3e771..0b0fb80ae5 100644
--- a/lxd/storage/drivers/driver_zfs.go
+++ b/lxd/storage/drivers/driver_zfs.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var zfsVersion string
diff --git a/lxd/storage/drivers/driver_zfs_patches.go b/lxd/storage/drivers/driver_zfs_patches.go
index abf8d09879..5937491323 100644
--- a/lxd/storage/drivers/driver_zfs_patches.go
+++ b/lxd/storage/drivers/driver_zfs_patches.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 func (d *zfs) patchStorageCreateVM() error {
diff --git a/lxd/storage/drivers/driver_zfs_utils.go b/lxd/storage/drivers/driver_zfs_utils.go
index 13e59cb80f..621536dae4 100644
--- a/lxd/storage/drivers/driver_zfs_utils.go
+++ b/lxd/storage/drivers/driver_zfs_utils.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/ioprogress"
 )
 
 func (d *zfs) dataset(vol Volume, deleted bool) string {
diff --git a/lxd/storage/drivers/driver_zfs_volumes.go b/lxd/storage/drivers/driver_zfs_volumes.go
index e114c82e66..0565c27a78 100644
--- a/lxd/storage/drivers/driver_zfs_volumes.go
+++ b/lxd/storage/drivers/driver_zfs_volumes.go
@@ -16,16 +16,16 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied
diff --git a/lxd/storage/drivers/drivers_mock.go b/lxd/storage/drivers/drivers_mock.go
index 9f1c379179..207d9830d6 100644
--- a/lxd/storage/drivers/drivers_mock.go
+++ b/lxd/storage/drivers/drivers_mock.go
@@ -3,11 +3,11 @@ package drivers
 import (
 	"io"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
 )
 
 type mock struct {
diff --git a/lxd/storage/drivers/generic_vfs.go b/lxd/storage/drivers/generic_vfs.go
index 4f90dbb8b2..c9b200cf46 100644
--- a/lxd/storage/drivers/generic_vfs.go
+++ b/lxd/storage/drivers/generic_vfs.go
@@ -12,17 +12,17 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // genericVolumeDiskFile used to indicate the file name used for block volume disk files.
diff --git a/lxd/storage/drivers/interface.go b/lxd/storage/drivers/interface.go
index 82450ad5e5..41fa8685b5 100644
--- a/lxd/storage/drivers/interface.go
+++ b/lxd/storage/drivers/interface.go
@@ -3,13 +3,13 @@ package drivers
 import (
 	"io"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // driver is the extended internal interface.
diff --git a/lxd/storage/drivers/load.go b/lxd/storage/drivers/load.go
index 38e41058f6..81ac54f86e 100644
--- a/lxd/storage/drivers/load.go
+++ b/lxd/storage/drivers/load.go
@@ -1,8 +1,8 @@
 package drivers
 
 import (
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 var drivers = map[string]func() driver{
diff --git a/lxd/storage/drivers/utils.go b/lxd/storage/drivers/utils.go
index c07f91928f..ea2adaecf5 100644
--- a/lxd/storage/drivers/utils.go
+++ b/lxd/storage/drivers/utils.go
@@ -14,9 +14,9 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
 )
 
 // MinBlockBoundary minimum block boundary size to use.
diff --git a/lxd/storage/drivers/utils_cgo.go b/lxd/storage/drivers/utils_cgo.go
index 88309f5514..9c7e0c88bb 100644
--- a/lxd/storage/drivers/utils_cgo.go
+++ b/lxd/storage/drivers/utils_cgo.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/storage/drivers/volume.go b/lxd/storage/drivers/volume.go
index 2b36619f66..834d26d5a4 100644
--- a/lxd/storage/drivers/volume.go
+++ b/lxd/storage/drivers/volume.go
@@ -6,12 +6,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/locking"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/refcount"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/lxd/locking"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/refcount"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // tmpVolSuffix Suffix to use for any temporary volumes created by LXD.
diff --git a/lxd/storage/load.go b/lxd/storage/load.go
index 1ccab79df0..077a44d83e 100644
--- a/lxd/storage/load.go
+++ b/lxd/storage/load.go
@@ -3,16 +3,16 @@ package storage
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
 )
 
 // volIDFuncMake returns a function that can be supplied to the underlying storage drivers allowing
diff --git a/lxd/storage/pool_interface.go b/lxd/storage/pool_interface.go
index 5423c89829..38807bc864 100644
--- a/lxd/storage/pool_interface.go
+++ b/lxd/storage/pool_interface.go
@@ -4,13 +4,13 @@ import (
 	"io"
 	"time"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/instancewriter"
 )
 
 // MountInfo represents info about the result of a mount operation.
diff --git a/lxd/storage/quota/projectquota.go b/lxd/storage/quota/projectquota.go
index 395fe931fe..f0f767476e 100644
--- a/lxd/storage/quota/projectquota.go
+++ b/lxd/storage/quota/projectquota.go
@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 /*
diff --git a/lxd/storage/storage.go b/lxd/storage/storage.go
index 2c680aa8f6..44c2abd0d1 100644
--- a/lxd/storage/storage.go
+++ b/lxd/storage/storage.go
@@ -3,9 +3,9 @@ package storage
 import (
 	"os"
 
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/shared"
 )
 
 // InstancePath returns the directory of an instance or snapshot.
diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go
index 1e2b7c9fab..e291875f4c 100644
--- a/lxd/storage/utils.go
+++ b/lxd/storage/utils.go
@@ -12,25 +12,25 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/robfig/cron.v2"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/instance/instancetype"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/lxd/node"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/rsync"
-	"github.com/lxc/lxd/lxd/state"
-	"github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/ioprogress"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/logging"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/lxd/node"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/rsync"
+	"github.com/grant-he/lxd/lxd/state"
+	"github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logging"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 // ValidName validates the provided name, and returns an error if it's not a valid storage name.
diff --git a/lxd/storage_migration.go b/lxd/storage_migration.go
index 5ff3e38896..1af549ede3 100644
--- a/lxd/storage_migration.go
+++ b/lxd/storage_migration.go
@@ -3,11 +3,11 @@ package main
 import (
 	"time"
 
-	"github.com/lxc/lxd/lxd/db"
-	deviceConfig "github.com/lxc/lxd/lxd/device/config"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/migration"
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/lxd/db"
+	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/grant-he/lxd/shared"
 )
 
 func snapshotProtobufToInstanceArgs(inst instance.Instance, snap *migration.Snapshot) db.InstanceArgs {
diff --git a/lxd/storage_pools.go b/lxd/storage_pools.go
index c631d7cbc7..f5df93d12b 100644
--- a/lxd/storage_pools.go
+++ b/lxd/storage_pools.go
@@ -10,15 +10,15 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/lxc/lxd/client"
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/response"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	lxd "github.com/grant-he/lxd/client"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/response"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 // Lock to prevent concurent storage pools creation
diff --git a/lxd/storage_pools_config.go b/lxd/storage_pools_config.go
index 09916394bf..991c089458 100644
--- a/lxd/storage_pools_config.go
+++ b/lxd/storage_pools_config.go
@@ -7,10 +7,10 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 var storagePoolConfigKeys = map[string]func(value string) error{
diff --git a/lxd/storage_pools_utils.go b/lxd/storage_pools_utils.go
index 57cc08b74f..4afdd31b75 100644
--- a/lxd/storage_pools_utils.go
+++ b/lxd/storage_pools_utils.go
@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 func storagePoolUpdate(state *state.State, name, newDescription string, newConfig map[string]string, withDB bool) error {
diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go
index 2c95560f3e..58ab965296 100644
--- a/lxd/storage_volumes.go
+++ b/lxd/storage_volumes.go
@@ -14,21 +14,21 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	"github.com/lxc/lxd/lxd/revert"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/storage_volumes_backup.go b/lxd/storage_volumes_backup.go
index fd52701dc4..88ccf400f2 100644
--- a/lxd/storage_volumes_backup.go
+++ b/lxd/storage_volumes_backup.go
@@ -8,16 +8,16 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/storage_volumes_snapshot.go b/lxd/storage_volumes_snapshot.go
index 7d56b5cefd..76f1013330 100644
--- a/lxd/storage_volumes_snapshot.go
+++ b/lxd/storage_volumes_snapshot.go
@@ -17,19 +17,19 @@ import (
 	"github.com/pkg/errors"
 	cron "gopkg.in/robfig/cron.v2"
 
-	"github.com/lxc/lxd/lxd/cluster"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/operations"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/response"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/lxd/task"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/cluster"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/operations"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/response"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/lxd/task"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var storagePoolVolumeSnapshotsTypeCmd = APIEndpoint{
diff --git a/lxd/storage_volumes_utils.go b/lxd/storage_volumes_utils.go
index a66d57f454..f1d12093bd 100644
--- a/lxd/storage_volumes_utils.go
+++ b/lxd/storage_volumes_utils.go
@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/backup"
-	"github.com/lxc/lxd/lxd/db"
-	"github.com/lxc/lxd/lxd/instance"
-	"github.com/lxc/lxd/lxd/project"
-	"github.com/lxc/lxd/lxd/state"
-	storagePools "github.com/lxc/lxd/lxd/storage"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/version"
+	"github.com/grant-he/lxd/lxd/backup"
+	"github.com/grant-he/lxd/lxd/db"
+	"github.com/grant-he/lxd/lxd/instance"
+	"github.com/grant-he/lxd/lxd/project"
+	"github.com/grant-he/lxd/lxd/state"
+	storagePools "github.com/grant-he/lxd/lxd/storage"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/version"
 )
 
 var supportedVolumeTypes = []int{db.StoragePoolVolumeTypeContainer, db.StoragePoolVolumeTypeVM, db.StoragePoolVolumeTypeCustom, db.StoragePoolVolumeTypeImage}
diff --git a/lxd/sys/apparmor.go b/lxd/sys/apparmor.go
index ae6a3b3a4c..9377245c4e 100644
--- a/lxd/sys/apparmor.go
+++ b/lxd/sys/apparmor.go
@@ -9,12 +9,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/syndtr/gocapability/capability"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // Initialize AppArmor-specific attributes.
diff --git a/lxd/sys/os.go b/lxd/sys/os.go
index 0ab6d8f281..03e8958203 100644
--- a/lxd/sys/os.go
+++ b/lxd/sys/os.go
@@ -8,13 +8,13 @@ import (
 	"strconv"
 	"sync"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 
-	"github.com/lxc/lxd/lxd/cgroup"
-	"github.com/lxc/lxd/lxd/util"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/lxd/cgroup"
+	"github.com/grant-he/lxd/lxd/util"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // InotifyTargetInfo records the inotify information associated with a given
diff --git a/lxd/task/group_test.go b/lxd/task/group_test.go
index a542b9b711..6472069580 100644
--- a/lxd/task/group_test.go
+++ b/lxd/task/group_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/task"
+	"github.com/grant-he/lxd/lxd/task"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/task/task_test.go b/lxd/task/task_test.go
index 1fad2dbe7f..c4fb422aa4 100644
--- a/lxd/task/task_test.go
+++ b/lxd/task/task_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/lxd/task"
+	"github.com/grant-he/lxd/lxd/task"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/util/config.go b/lxd/util/config.go
index f8c0969dc7..497bcd5bfd 100644
--- a/lxd/util/config.go
+++ b/lxd/util/config.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // CompareConfigs compares two config maps and returns an error if they differ.
diff --git a/lxd/util/config_test.go b/lxd/util/config_test.go
index 4373149d8b..da53314491 100644
--- a/lxd/util/config_test.go
+++ b/lxd/util/config_test.go
@@ -3,7 +3,7 @@ package util_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/lxd/util"
+	"github.com/grant-he/lxd/lxd/util"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/lxd/util/encryption.go b/lxd/util/encryption.go
index 8317f8de37..7c13062c1b 100644
--- a/lxd/util/encryption.go
+++ b/lxd/util/encryption.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 	"github.com/pkg/errors"
 
 	"golang.org/x/crypto/scrypt"
diff --git a/lxd/util/fs.go b/lxd/util/fs.go
index 0b9dfe9aac..c62e4a11ba 100644
--- a/lxd/util/fs.go
+++ b/lxd/util/fs.go
@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // Filesystem magic numbers
diff --git a/lxd/util/http.go b/lxd/util/http.go
index 54988d107b..a5208d010c 100644
--- a/lxd/util/http.go
+++ b/lxd/util/http.go
@@ -19,10 +19,10 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // WriteJSON encodes the body as JSON and sends it back to the client
diff --git a/lxd/util/kernel.go b/lxd/util/kernel.go
index 4019477af7..d26725c508 100644
--- a/lxd/util/kernel.go
+++ b/lxd/util/kernel.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // LoadModule loads the kernel module with the given name, by invoking
diff --git a/lxd/util/net.go b/lxd/util/net.go
index f707737fe4..674b7b3ed6 100644
--- a/lxd/util/net.go
+++ b/lxd/util/net.go
@@ -7,8 +7,8 @@ import (
 	"io/ioutil"
 	"net"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // InMemoryNetwork creates a fully in-memory listener and dial function.
diff --git a/lxd/util/net_test.go b/lxd/util/net_test.go
index 9702629bc2..dc63304696 100644
--- a/lxd/util/net_test.go
+++ b/lxd/util/net_test.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/lxc/lxd/lxd/util"
+	"github.com/grant-he/lxd/lxd/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/util/sys.go b/lxd/util/sys.go
index 35afb59d84..d096697883 100644
--- a/lxd/util/sys.go
+++ b/lxd/util/sys.go
@@ -8,12 +8,12 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 // GetArchitectures returns the list of supported architectures.
diff --git a/lxd/vsock/vsock.go b/lxd/vsock/vsock.go
index ccbe04317a..a64856adee 100644
--- a/lxd/vsock/vsock.go
+++ b/lxd/vsock/vsock.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/mdlayher/vsock"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Dial connects to a remote vsock.
diff --git a/shared/archive_linux.go b/shared/archive_linux.go
index 17a4b9c208..bafd37ed51 100644
--- a/shared/archive_linux.go
+++ b/shared/archive_linux.go
@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func Unpack(file string, path string, blockBackend bool, runningInUserns bool, tracker *ioprogress.ProgressTracker) error {
diff --git a/shared/cert_test.go b/shared/cert_test.go
index a1874ece75..072cd8b5d5 100644
--- a/shared/cert_test.go
+++ b/shared/cert_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // A new key pair is generated if none exists and saved to the appropriate
diff --git a/shared/cmd/ask.go b/shared/cmd/ask.go
index eb5edd078b..0f7076a4c7 100644
--- a/shared/cmd/ask.go
+++ b/shared/cmd/ask.go
@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 var stdin = bufio.NewReader(os.Stdin)
diff --git a/shared/eagain/file_unix.go b/shared/eagain/file_unix.go
index bd671df906..9a914bb445 100644
--- a/shared/eagain/file_unix.go
+++ b/shared/eagain/file_unix.go
@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Reader represents an io.Reader that handles EAGAIN
diff --git a/shared/generate/db.go b/shared/generate/db.go
index 6775c73a1d..b73cc4b97d 100644
--- a/shared/generate/db.go
+++ b/shared/generate/db.go
@@ -6,9 +6,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/lxd/shared/generate/db"
-	"github.com/lxc/lxd/shared/generate/file"
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared/generate/db"
+	"github.com/grant-he/lxd/shared/generate/file"
+	"github.com/grant-he/lxd/shared/generate/lex"
 )
 
 // Return a new db command.
diff --git a/shared/generate/db/constants.go b/shared/generate/db/constants.go
index 83e91219c1..9cc5888754 100644
--- a/shared/generate/db/constants.go
+++ b/shared/generate/db/constants.go
@@ -4,8 +4,8 @@ package db
 var Imports = []string{
 	"database/sql",
 	"fmt",
-	"github.com/lxc/lxd/lxd/db/cluster",
-	"github.com/lxc/lxd/lxd/db/query",
-	"github.com/lxc/lxd/shared/api",
+	"github.com/grant-he/lxd/lxd/db/cluster",
+	"github.com/grant-he/lxd/lxd/db/query",
+	"github.com/grant-he/lxd/shared/api",
 	"github.com/pkg/errors",
 }
diff --git a/shared/generate/db/lex.go b/shared/generate/db/lex.go
index b2aa81dc3c..0ce3c8dbe8 100644
--- a/shared/generate/db/lex.go
+++ b/shared/generate/db/lex.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared/generate/lex"
 )
 
 // Return the table name for the given database entity.
diff --git a/shared/generate/db/mapping.go b/shared/generate/db/mapping.go
index 3d7df29efc..e3bb66d0b8 100644
--- a/shared/generate/db/mapping.go
+++ b/shared/generate/db/mapping.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/generate/lex"
 )
 
 // Mapping holds information for mapping database tables to a Go structure.
diff --git a/shared/generate/db/method.go b/shared/generate/db/method.go
index d89b8efc5f..6cac04f025 100644
--- a/shared/generate/db/method.go
+++ b/shared/generate/db/method.go
@@ -5,8 +5,8 @@ import (
 	"go/ast"
 	"strings"
 
-	"github.com/lxc/lxd/shared/generate/file"
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared/generate/file"
+	"github.com/grant-he/lxd/shared/generate/lex"
 	"github.com/pkg/errors"
 )
 
diff --git a/shared/generate/db/parse.go b/shared/generate/db/parse.go
index a4d44eec1d..adc445f2b2 100644
--- a/shared/generate/db/parse.go
+++ b/shared/generate/db/parse.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared/generate/lex"
 	"github.com/pkg/errors"
 )
 
@@ -31,8 +31,8 @@ func Packages() (map[string]*ast.Package, error) {
 }
 
 var defaultPackages = []string{
-	"github.com/lxc/lxd/shared/api",
-	"github.com/lxc/lxd/lxd/db",
+	"github.com/grant-he/lxd/shared/api",
+	"github.com/grant-he/lxd/lxd/db",
 }
 
 // Filters parses all filtering statement defined for the given entity. It
diff --git a/shared/generate/db/parse_test.go b/shared/generate/db/parse_test.go
index a6045cff1a..44e488c7ce 100644
--- a/shared/generate/db/parse_test.go
+++ b/shared/generate/db/parse_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lxc/lxd/shared/generate/db"
+	"github.com/grant-he/lxd/shared/generate/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/shared/generate/db/schema.go b/shared/generate/db/schema.go
index 0d82f68e51..7bf92a3958 100644
--- a/shared/generate/db/schema.go
+++ b/shared/generate/db/schema.go
@@ -3,8 +3,8 @@ package db
 import (
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/lxd/db/cluster"
-	"github.com/lxc/lxd/lxd/db/node"
+	"github.com/grant-he/lxd/lxd/db/cluster"
+	"github.com/grant-he/lxd/lxd/db/node"
 )
 
 // UpdateSchema updates the schema.go file of the cluster and node databases.
diff --git a/shared/generate/db/stmt.go b/shared/generate/db/stmt.go
index c48f3c8ccb..d9efa8802f 100644
--- a/shared/generate/db/stmt.go
+++ b/shared/generate/db/stmt.go
@@ -5,8 +5,8 @@ import (
 	"go/ast"
 	"strings"
 
-	"github.com/lxc/lxd/shared/generate/file"
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared/generate/file"
+	"github.com/grant-he/lxd/shared/generate/lex"
 	"github.com/pkg/errors"
 )
 
diff --git a/shared/generate/lex/parse_test.go b/shared/generate/lex/parse_test.go
index 648aeb879c..a6533b3bd0 100644
--- a/shared/generate/lex/parse_test.go
+++ b/shared/generate/lex/parse_test.go
@@ -3,13 +3,13 @@ package lex_test
 import (
 	"testing"
 
-	"github.com/lxc/lxd/shared/generate/lex"
+	"github.com/grant-he/lxd/shared/generate/lex"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestParse(t *testing.T) {
-	pkg, err := lex.Parse("github.com/lxc/lxd/shared/generate/lex")
+	pkg, err := lex.Parse("github.com/grant-he/lxd/shared/generate/lex")
 	require.NoError(t, err)
 
 	obj := pkg.Scope.Lookup("Parse")
diff --git a/shared/idmap/idmapset_linux.go b/shared/idmap/idmapset_linux.go
index fe98e731c0..449ad8822b 100644
--- a/shared/idmap/idmapset_linux.go
+++ b/shared/idmap/idmapset_linux.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go
index c61f534ca6..a3726c381c 100644
--- a/shared/idmap/shift_linux.go
+++ b/shared/idmap/shift_linux.go
@@ -13,10 +13,10 @@ import (
 	"golang.org/x/sys/unix"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // #cgo LDFLAGS: -lacl
diff --git a/shared/instance.go b/shared/instance.go
index 023573a0cf..0dfc45058e 100644
--- a/shared/instance.go
+++ b/shared/instance.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/robfig/cron.v2"
 
-	"github.com/lxc/lxd/shared/units"
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 type InstanceAction string
diff --git a/shared/instancewriter/instance_tar_writer.go b/shared/instancewriter/instance_tar_writer.go
index 3a1599ad36..79ea35be57 100644
--- a/shared/instancewriter/instance_tar_writer.go
+++ b/shared/instancewriter/instance_tar_writer.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/idmap"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // InstanceTarWriter provides a TarWriter implementation that handles ID shifting and hardlink tracking.
diff --git a/shared/json.go b/shared/json.go
index 09f1066653..eed5d78158 100644
--- a/shared/json.go
+++ b/shared/json.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 type Jmap map[string]interface{}
diff --git a/shared/log15/handler.go b/shared/log15/handler.go
index a9efc113fc..60abc7b858 100644
--- a/shared/log15/handler.go
+++ b/shared/log15/handler.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/lxc/lxd/shared/log15/stack"
+	"github.com/grant-he/lxd/shared/log15/stack"
 )
 
 // A Logger prints its log records by writing to a Handler.
diff --git a/shared/log15/root.go b/shared/log15/root.go
index ed3a3cf54a..a757d9c576 100644
--- a/shared/log15/root.go
+++ b/shared/log15/root.go
@@ -3,7 +3,7 @@ package log15
 import (
 	"os"
 
-	"github.com/lxc/lxd/shared/log15/term"
+	"github.com/grant-he/lxd/shared/log15/term"
 	"github.com/mattn/go-colorable"
 )
 
diff --git a/shared/logging/format.go b/shared/logging/format.go
index 13bca7acf2..c0351cf9ea 100644
--- a/shared/logging/format.go
+++ b/shared/logging/format.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 const (
diff --git a/shared/logging/log.go b/shared/logging/log.go
index 673264bf1a..09269bab88 100644
--- a/shared/logging/log.go
+++ b/shared/logging/log.go
@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"time"
 
-	log "github.com/lxc/lxd/shared/log15"
-	"github.com/lxc/lxd/shared/log15/term"
+	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/grant-he/lxd/shared/log15/term"
 
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // GetLogger returns a logger suitable for using as logger.Log.
diff --git a/shared/logging/log_posix.go b/shared/logging/log_posix.go
index 91c1bebdc8..2b993e8cbf 100644
--- a/shared/logging/log_posix.go
+++ b/shared/logging/log_posix.go
@@ -3,7 +3,7 @@
 package logging
 
 import (
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // getSystemHandler on Linux writes messages to syslog.
diff --git a/shared/logging/log_windows.go b/shared/logging/log_windows.go
index 467f9323c1..83ef8584a6 100644
--- a/shared/logging/log_windows.go
+++ b/shared/logging/log_windows.go
@@ -3,7 +3,7 @@
 package logging
 
 import (
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // getSystemHandler on Windows does nothing.
diff --git a/shared/logging/testing.go b/shared/logging/testing.go
index bad3375c9a..bd5d58a557 100644
--- a/shared/logging/testing.go
+++ b/shared/logging/testing.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	log "github.com/lxc/lxd/shared/log15"
+	log "github.com/grant-he/lxd/shared/log15"
 )
 
 // Testing installs a global logger that emits messages using the t.Logf method
diff --git a/shared/netutils/network_linux.go b/shared/netutils/network_linux.go
index c006e7f388..b17a25221b 100644
--- a/shared/netutils/network_linux.go
+++ b/shared/netutils/network_linux.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 // WebsocketExecMirror mirrors a websocket connection with a set of Writer/Reader.
diff --git a/shared/netutils/network_linux_cgo.go b/shared/netutils/network_linux_cgo.go
index e161f37de3..1509f91436 100644
--- a/shared/netutils/network_linux_cgo.go
+++ b/shared/netutils/network_linux_cgo.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/api"
 )
 
 /*
diff --git a/shared/network.go b/shared/network.go
index 3a49052850..b1ab0fc223 100644
--- a/shared/network.go
+++ b/shared/network.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/logger"
 )
 
 func RFC3493Dialer(network, address string) (net.Conn, error) {
diff --git a/shared/osarch/architectures_linux.go b/shared/osarch/architectures_linux.go
index a87e795a8d..20101a6a03 100644
--- a/shared/osarch/architectures_linux.go
+++ b/shared/osarch/architectures_linux.go
@@ -3,7 +3,7 @@
 package osarch
 
 import (
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // ArchitectureGetLocal returns the local hardware architecture
diff --git a/shared/osarch/tempfile_test.go b/shared/osarch/tempfile_test.go
index 24a30b74ec..f0dae9a614 100644
--- a/shared/osarch/tempfile_test.go
+++ b/shared/osarch/tempfile_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // WriteTempFile writes content to a temporary file.
diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go
index b7a0d1a124..f6aa5824a0 100644
--- a/shared/simplestreams/products.go
+++ b/shared/simplestreams/products.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 // Products represents the base of download.json
diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go
index 4d623f6eb2..8e7fa40d00 100644
--- a/shared/simplestreams/simplestreams.go
+++ b/shared/simplestreams/simplestreams.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 var urlDefaultOS = map[string]string{
diff --git a/shared/simplestreams/sort.go b/shared/simplestreams/sort.go
index d22b13aff8..189a6d7f64 100644
--- a/shared/simplestreams/sort.go
+++ b/shared/simplestreams/sort.go
@@ -1,8 +1,8 @@
 package simplestreams
 
 import (
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/api"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 var nativeName, _ = osarch.ArchitectureGetLocal()
diff --git a/shared/subprocess/proc.go b/shared/subprocess/proc.go
index 27ee69d7e8..ba133134cc 100644
--- a/shared/subprocess/proc.go
+++ b/shared/subprocess/proc.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // Process struct. Has ability to set runtime arguments
diff --git a/shared/termios/termios_unix.go b/shared/termios/termios_unix.go
index 7d9622fc08..e2ccffc950 100644
--- a/shared/termios/termios_unix.go
+++ b/shared/termios/termios_unix.go
@@ -7,7 +7,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/grant-he/lxd/shared"
 )
 
 // #include <termios.h>
diff --git a/shared/util.go b/shared/util.go
index ed0bc08553..4aced535c3 100644
--- a/shared/util.go
+++ b/shared/util.go
@@ -27,9 +27,9 @@ import (
 	"github.com/flosch/pongo2"
 	"github.com/pkg/errors"
 
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/cancel"
+	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 const SnapshotDelimiter = "/"
diff --git a/shared/util_linux.go b/shared/util_linux.go
index ee689dd8aa..8e2d0f8bdc 100644
--- a/shared/util_linux.go
+++ b/shared/util_linux.go
@@ -17,8 +17,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/logger"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // --- pure Go functions ---
diff --git a/shared/util_linux_cgo.go b/shared/util_linux_cgo.go
index 155975d265..f4fcd4a861 100644
--- a/shared/util_linux_cgo.go
+++ b/shared/util_linux_cgo.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	// Used by cgo
-	_ "github.com/lxc/lxd/lxd/include"
+	_ "github.com/grant-he/lxd/lxd/include"
 
 	"golang.org/x/sys/unix"
 )
diff --git a/shared/validate/validate.go b/shared/validate/validate.go
index 70ac4ef807..f23842894a 100644
--- a/shared/validate/validate.go
+++ b/shared/validate/validate.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/lxc/lxd/shared/units"
+	"github.com/grant-he/lxd/shared/units"
 )
 
 // stringInSlice checks whether the supplied string is present in the supplied slice.
diff --git a/shared/validate/validate_test.go b/shared/validate/validate_test.go
index e5d6991841..06642b65ef 100644
--- a/shared/validate/validate_test.go
+++ b/shared/validate/validate_test.go
@@ -3,7 +3,7 @@ package validate_test
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/shared/validate"
+	"github.com/grant-he/lxd/shared/validate"
 )
 
 func ExampleIsNetworkMAC() {
diff --git a/shared/version/platform_linux.go b/shared/version/platform_linux.go
index c6c3a87b57..dbf0f0fe5b 100644
--- a/shared/version/platform_linux.go
+++ b/shared/version/platform_linux.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 func getPlatformVersionStrings() []string {
diff --git a/shared/version/useragent.go b/shared/version/useragent.go
index 83bf047517..61c199c057 100644
--- a/shared/version/useragent.go
+++ b/shared/version/useragent.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/lxc/lxd/shared/osarch"
+	"github.com/grant-he/lxd/shared/osarch"
 )
 
 // UserAgent contains a string suitable as a user-agent

From cbfdcb2bf7ed12a73073815a57b1d144f76b22a2 Mon Sep 17 00:00:00 2001
From: JLRDRAGON92000 <jlrdragon at gmail.com>
Date: Wed, 25 Nov 2020 00:36:31 -0600
Subject: [PATCH 2/4] lxd/config: allowed user.* keys in server config (have
 not yet tested/verified semantics in a cluster)

Signed-off-by: Jared Rankin <jared.rankin at utexas.edu>
---
 lxd/config/map.go | 51 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/lxd/config/map.go b/lxd/config/map.go
index bbc8711a91..f78a772a5f 100644
--- a/lxd/config/map.go
+++ b/lxd/config/map.go
@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/grant-he/lxd/shared"
 )
@@ -95,14 +96,21 @@ func (m *Map) Change(changes map[string]interface{}) (map[string]string, error)
 func (m *Map) Dump() map[string]interface{} {
 	values := map[string]interface{}{}
 
-	for name, key := range m.schema {
-		value := m.GetRaw(name)
-		if value != key.Default {
-			if key.Hidden {
-				values[name] = true
-			} else {
-				values[name] = value
+	for name, value := range m.values {
+		key, ok := m.schema[name]
+		if ok {
+			// Schema key
+			value := m.GetRaw(name)
+			if value != key.Default {
+				if key.Hidden {
+					values[name] = true
+				} else {
+					values[name] = value
+				}
 			}
+		} else if strings.HasPrefix(name, "user.") {
+			// User key, just include it as is
+			values[name] = value
 		}
 	}
 
@@ -111,17 +119,21 @@ func (m *Map) Dump() map[string]interface{} {
 
 // GetRaw returns the value of the given key, which must be of type String.
 func (m *Map) GetRaw(name string) string {
-	key := m.schema.mustGetKey(name)
 	value, ok := m.values[name]
-	if !ok {
-		value = key.Default
+	if !strings.HasPrefix(name, "user.") {
+		key := m.schema.mustGetKey(name)
+		if !ok {
+			value = key.Default
+		}
 	}
 	return value
 }
 
 // GetString returns the value of the given key, which must be of type String.
 func (m *Map) GetString(name string) string {
-	m.schema.assertKeyType(name, String)
+	if !strings.HasPrefix(name, "user.") {
+		m.schema.assertKeyType(name, String)
+	}
 	return m.GetRaw(name)
 }
 
@@ -182,6 +194,23 @@ func (m *Map) update(values map[string]string) ([]string, error) {
 // effectively revert it to the default. Return a boolean indicating whether
 // the value has changed, and error if something went wrong.
 func (m *Map) set(name string, value string, initial bool) (bool, error) {
+	// Bypass schema for user.* keys
+	if strings.HasPrefix(name, "user.") {
+		current, ok := m.values[name]
+		if ok && value == current {
+			// Value is unchanged
+			return false, nil
+		}
+
+		if value == "" {
+			delete(m.values, name)
+		} else {
+			m.values[name] = value
+		}
+
+		return true, nil
+	}
+
 	key, ok := m.schema[name]
 	if !ok {
 		return false, fmt.Errorf("unknown key")

From a8d0b6d4464aef10a89ab4882e6380f12395e74f Mon Sep 17 00:00:00 2001
From: JLRDRAGON92000 <jlrdragon at gmail.com>
Date: Wed, 25 Nov 2020 00:36:31 -0600
Subject: [PATCH 3/4] lxd/config: allowed user.* keys in server/cluster config

Signed-off-by: Jared Rankin <jared.rankin at utexas.edu>
---
 lxd/config/map.go | 51 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/lxd/config/map.go b/lxd/config/map.go
index bbc8711a91..f78a772a5f 100644
--- a/lxd/config/map.go
+++ b/lxd/config/map.go
@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/grant-he/lxd/shared"
 )
@@ -95,14 +96,21 @@ func (m *Map) Change(changes map[string]interface{}) (map[string]string, error)
 func (m *Map) Dump() map[string]interface{} {
 	values := map[string]interface{}{}
 
-	for name, key := range m.schema {
-		value := m.GetRaw(name)
-		if value != key.Default {
-			if key.Hidden {
-				values[name] = true
-			} else {
-				values[name] = value
+	for name, value := range m.values {
+		key, ok := m.schema[name]
+		if ok {
+			// Schema key
+			value := m.GetRaw(name)
+			if value != key.Default {
+				if key.Hidden {
+					values[name] = true
+				} else {
+					values[name] = value
+				}
 			}
+		} else if strings.HasPrefix(name, "user.") {
+			// User key, just include it as is
+			values[name] = value
 		}
 	}
 
@@ -111,17 +119,21 @@ func (m *Map) Dump() map[string]interface{} {
 
 // GetRaw returns the value of the given key, which must be of type String.
 func (m *Map) GetRaw(name string) string {
-	key := m.schema.mustGetKey(name)
 	value, ok := m.values[name]
-	if !ok {
-		value = key.Default
+	if !strings.HasPrefix(name, "user.") {
+		key := m.schema.mustGetKey(name)
+		if !ok {
+			value = key.Default
+		}
 	}
 	return value
 }
 
 // GetString returns the value of the given key, which must be of type String.
 func (m *Map) GetString(name string) string {
-	m.schema.assertKeyType(name, String)
+	if !strings.HasPrefix(name, "user.") {
+		m.schema.assertKeyType(name, String)
+	}
 	return m.GetRaw(name)
 }
 
@@ -182,6 +194,23 @@ func (m *Map) update(values map[string]string) ([]string, error) {
 // effectively revert it to the default. Return a boolean indicating whether
 // the value has changed, and error if something went wrong.
 func (m *Map) set(name string, value string, initial bool) (bool, error) {
+	// Bypass schema for user.* keys
+	if strings.HasPrefix(name, "user.") {
+		current, ok := m.values[name]
+		if ok && value == current {
+			// Value is unchanged
+			return false, nil
+		}
+
+		if value == "" {
+			delete(m.values, name)
+		} else {
+			m.values[name] = value
+		}
+
+		return true, nil
+	}
+
 	key, ok := m.schema[name]
 	if !ok {
 		return false, fmt.Errorf("unknown key")

From 603caeaba8a585730f9ac017744b875741c2fc88 Mon Sep 17 00:00:00 2001
From: JLRDRAGON92000 <jlrdragon at gmail.com>
Date: Mon, 30 Nov 2020 17:23:27 -0600
Subject: [PATCH 4/4] removed references to our fork of LXD

Signed-off-by: Jared Rankin <jared.rankin at utexas.edu>
---
 client/connection.go                          |  6 +-
 client/events.go                              |  2 +-
 client/interfaces.go                          |  6 +-
 client/lxd.go                                 |  6 +-
 client/lxd_certificates.go                    |  2 +-
 client/lxd_cluster.go                         |  2 +-
 client/lxd_containers.go                      | 10 +--
 client/lxd_events.go                          |  4 +-
 client/lxd_images.go                          | 10 +--
 client/lxd_instances.go                       | 10 +--
 client/lxd_networks.go                        |  2 +-
 client/lxd_operations.go                      |  2 +-
 client/lxd_profiles.go                        |  2 +-
 client/lxd_projects.go                        |  2 +-
 client/lxd_server.go                          |  4 +-
 client/lxd_storage_pools.go                   |  2 +-
 client/lxd_storage_volumes.go                 |  8 +--
 client/operations.go                          |  2 +-
 client/simplestreams.go                       |  2 +-
 client/simplestreams_images.go                |  4 +-
 client/util.go                                |  2 +-
 fuidshift/main.go                             |  2 +-
 fuidshift/main_shift.go                       |  2 +-
 lxc-to-lxd/config.go                          |  2 +-
 lxc-to-lxd/main.go                            |  2 +-
 lxc-to-lxd/main_migrate.go                    | 12 ++--
 lxc-to-lxd/main_netcat.go                     |  2 +-
 lxc-to-lxd/transfer.go                        |  6 +-
 lxc-to-lxd/utils.go                           |  4 +-
 lxc/action.go                                 | 12 ++--
 lxc/alias.go                                  |  6 +-
 lxc/cluster.go                                | 12 ++--
 lxc/config.go                                 | 12 ++--
 lxc/config/cert.go                            |  2 +-
 lxc/config/file.go                            |  2 +-
 lxc/config/remote.go                          |  4 +-
 lxc/config_device.go                          |  4 +-
 lxc/config_metadata.go                        | 10 +--
 lxc/config_template.go                        | 10 +--
 lxc/config_trust.go                           | 10 +--
 lxc/console.go                                | 14 ++--
 lxc/console_unix.go                           |  2 +-
 lxc/copy.go                                   | 14 ++--
 lxc/delete.go                                 | 10 +--
 lxc/exec.go                                   | 12 ++--
 lxc/exec_unix.go                              |  4 +-
 lxc/exec_windows.go                           |  4 +-
 lxc/export.go                                 | 12 ++--
 lxc/file.go                                   | 18 ++---
 lxc/image.go                                  | 14 ++--
 lxc/image_alias.go                            |  8 +--
 lxc/import.go                                 | 14 ++--
 lxc/info.go                                   | 14 ++--
 lxc/init.go                                   | 14 ++--
 lxc/launch.go                                 |  8 +--
 lxc/list.go                                   | 16 ++---
 lxc/list_test.go                              |  4 +-
 lxc/main.go                                   | 16 ++---
 lxc/main_aliases.go                           |  6 +-
 lxc/main_test.go                              |  2 +-
 lxc/manpage.go                                |  6 +-
 lxc/monitor.go                                | 12 ++--
 lxc/move.go                                   | 10 +--
 lxc/network.go                                | 14 ++--
 lxc/operation.go                              |  6 +-
 lxc/profile.go                                | 12 ++--
 lxc/project.go                                | 12 ++--
 lxc/publish.go                                | 12 ++--
 lxc/query.go                                  |  6 +-
 lxc/remote.go                                 | 14 ++--
 lxc/rename.go                                 |  4 +-
 lxc/restore.go                                |  8 +--
 lxc/snapshot.go                               |  8 +--
 lxc/storage.go                                | 14 ++--
 lxc/storage_volume.go                         | 18 ++---
 lxc/utils.go                                  |  8 +--
 lxc/utils/cancel.go                           |  4 +-
 lxc/utils/progress.go                         |  6 +-
 lxc/utils/table.go                            |  2 +-
 lxc/utils_test.go                             |  2 +-
 lxc/version.go                                |  6 +-
 lxd-agent/api.go                              |  2 +-
 lxd-agent/api_1.0.go                          |  8 +--
 lxd-agent/daemon.go                           |  2 +-
 lxd-agent/devlxd.go                           | 10 +--
 lxd-agent/events.go                           |  8 +--
 lxd-agent/exec.go                             | 14 ++--
 lxd-agent/file.go                             |  4 +-
 lxd-agent/main.go                             |  2 +-
 lxd-agent/main_agent.go                       | 12 ++--
 lxd-agent/network.go                          |  4 +-
 lxd-agent/operations.go                       | 10 +--
 lxd-agent/server.go                           |  8 +--
 lxd-agent/state.go                            |  6 +-
 lxd-agent/templates.go                        |  4 +-
 lxd-benchmark/benchmark/benchmark.go          |  8 +--
 lxd-benchmark/benchmark/operation.go          |  4 +-
 lxd-benchmark/main.go                         |  8 +--
 lxd-benchmark/main_delete.go                  |  2 +-
 lxd-benchmark/main_init.go                    |  2 +-
 lxd-benchmark/main_launch.go                  |  2 +-
 lxd-benchmark/main_start.go                   |  2 +-
 lxd-benchmark/main_stop.go                    |  2 +-
 lxd-p2c/main.go                               |  2 +-
 lxd-p2c/main_migrate.go                       |  6 +-
 lxd-p2c/main_netcat.go                        |  2 +-
 lxd-p2c/transfer.go                           |  6 +-
 lxd-p2c/utils.go                              | 10 +--
 lxd/api.go                                    | 12 ++--
 lxd/api_1.0.go                                | 26 +++----
 lxd/api_cluster.go                            | 28 ++++----
 lxd/api_cluster_test.go                       |  8 +--
 lxd/api_internal.go                           | 36 +++++-----
 lxd/api_networks_test.go                      |  2 +-
 lxd/api_project.go                            | 24 +++----
 lxd/api_storage_pools_test.go                 |  2 +-
 lxd/apparmor/apparmor.go                      |  6 +-
 lxd/apparmor/instance.go                      | 12 ++--
 lxd/apparmor/instance_forkproxy.go            | 10 +--
 lxd/apparmor/network.go                       |  2 +-
 lxd/apparmor/network_dnsmasq.go               |  4 +-
 lxd/apparmor/network_forkdns.go               |  6 +-
 lxd/backup.go                                 | 38 +++++-----
 lxd/backup/backup_common.go                   |  2 +-
 lxd/backup/backup_config.go                   |  6 +-
 lxd/backup/backup_info.go                     |  2 +-
 lxd/backup/backup_instance.go                 |  8 +--
 lxd/backup/backup_utils.go                    |  2 +-
 lxd/backup/backup_volume.go                   | 10 +--
 lxd/certificates.go                           | 22 +++---
 lxd/cgroup/abstraction.go                     |  2 +-
 lxd/cgroup/file.go                            |  2 +-
 lxd/cgroup/init.go                            |  4 +-
 lxd/cluster/config.go                         |  4 +-
 lxd/cluster/config_test.go                    |  4 +-
 lxd/cluster/connect.go                        | 16 ++---
 lxd/cluster/events.go                         | 14 ++--
 lxd/cluster/gateway.go                        |  8 +--
 lxd/cluster/gateway_export_test.go            |  4 +-
 lxd/cluster/gateway_test.go                   |  8 +--
 lxd/cluster/heartbeat.go                      |  8 +--
 lxd/cluster/heartbeat_test.go                 | 12 ++--
 lxd/cluster/info.go                           | 10 +--
 lxd/cluster/membership.go                     | 22 +++---
 lxd/cluster/membership_test.go                | 14 ++--
 lxd/cluster/migrate.go                        |  4 +-
 lxd/cluster/migrate_test.go                   |  4 +-
 lxd/cluster/notify.go                         | 12 ++--
 lxd/cluster/notify_test.go                    | 16 ++---
 lxd/cluster/raft_test.go                      |  6 +-
 lxd/cluster/recover.go                        |  4 +-
 lxd/cluster/resolve.go                        |  2 +-
 lxd/cluster/tls.go                            |  4 +-
 lxd/cluster/upgrade.go                        | 12 ++--
 lxd/cluster/upgrade_test.go                   |  8 +--
 lxd/config/map.go                             |  2 +-
 lxd/config/map_test.go                        |  2 +-
 lxd/config/safe.go                            |  4 +-
 lxd/config/safe_test.go                       |  2 +-
 lxd/config/schema.go                          |  2 +-
 lxd/config/schema_test.go                     |  2 +-
 lxd/config/validators_test.go                 |  2 +-
 lxd/daemon.go                                 | 54 +++++++-------
 lxd/daemon_config.go                          | 10 +--
 lxd/daemon_images.go                          | 28 ++++----
 lxd/daemon_integration_test.go                |  8 +--
 lxd/daemon_storage.go                         | 16 ++---
 lxd/db/backups.go                             |  4 +-
 lxd/db/certificates.mapper.go                 |  6 +-
 lxd/db/certificates_test.go                   |  2 +-
 lxd/db/cluster/constants.go                   |  2 +-
 lxd/db/cluster/open.go                        | 14 ++--
 lxd/db/cluster/open_test.go                   |  8 +--
 lxd/db/cluster/query.go                       |  2 +-
 lxd/db/cluster/update.go                      | 10 +--
 lxd/db/cluster/update_test.go                 |  6 +-
 lxd/db/config.go                              |  2 +-
 lxd/db/config_test.go                         |  2 +-
 lxd/db/db.go                                  | 10 +--
 lxd/db/db_internal_test.go                    |  6 +-
 lxd/db/db_test.go                             |  4 +-
 lxd/db/images.go                              |  8 +--
 lxd/db/images.mapper.go                       |  6 +-
 lxd/db/images_test.go                         |  2 +-
 lxd/db/instances.go                           | 12 ++--
 lxd/db/instances.mapper.go                    |  6 +-
 lxd/db/instances_test.go                      |  8 +--
 lxd/db/legacy.go                              |  2 +-
 lxd/db/migration.go                           |  6 +-
 lxd/db/migration_test.go                      |  6 +-
 lxd/db/networks.go                            |  6 +-
 lxd/db/networks_test.go                       |  4 +-
 lxd/db/node.go                                | 12 ++--
 lxd/db/node/open.go                           |  6 +-
 lxd/db/node/open_test.go                      |  2 +-
 lxd/db/node/update.go                         | 10 +--
 lxd/db/node/update_test.go                    |  6 +-
 lxd/db/node_test.go                           |  8 +--
 lxd/db/operations.go                          |  2 +-
 lxd/db/operations_test.go                     |  2 +-
 lxd/db/patches.go                             |  2 +-
 lxd/db/profiles.go                            |  4 +-
 lxd/db/profiles.mapper.go                     |  6 +-
 lxd/db/projects.go                            |  6 +-
 lxd/db/projects.mapper.go                     |  6 +-
 lxd/db/projects_test.go                       |  2 +-
 lxd/db/query/config_test.go                   |  2 +-
 lxd/db/query/count_test.go                    |  2 +-
 lxd/db/query/dump_test.go                     |  2 +-
 lxd/db/query/objects_test.go                  |  2 +-
 lxd/db/query/retry.go                         |  2 +-
 lxd/db/query/slices_test.go                   |  4 +-
 lxd/db/query/transaction.go                   |  2 +-
 lxd/db/query/transaction_test.go              |  2 +-
 lxd/db/raft.go                                |  2 +-
 lxd/db/raft_test.go                           |  2 +-
 lxd/db/schema/query.go                        |  4 +-
 lxd/db/schema/schema.go                       |  4 +-
 lxd/db/schema/schema_test.go                  |  6 +-
 lxd/db/schema/update_test.go                  |  4 +-
 lxd/db/snapshots.go                           |  2 +-
 lxd/db/snapshots.mapper.go                    |  6 +-
 lxd/db/snapshots_test.go                      |  6 +-
 lxd/db/storage_pools.go                       |  6 +-
 lxd/db/storage_pools_export_test.go           |  2 +-
 lxd/db/storage_pools_test.go                  |  2 +-
 lxd/db/storage_volume_snapshots.go            |  2 +-
 lxd/db/storage_volumes.go                     |  6 +-
 lxd/db/storage_volumes_test.go                |  2 +-
 lxd/device/device_common.go                   | 12 ++--
 lxd/device/device_interface.go                |  8 +--
 lxd/device/device_load.go                     |  8 +--
 lxd/device/device_utils_disk.go               |  2 +-
 lxd/device/device_utils_generic.go            |  4 +-
 lxd/device/device_utils_infiniband.go         |  6 +-
 lxd/device/device_utils_inotify.go            | 10 +--
 lxd/device/device_utils_instance.go           |  8 +--
 lxd/device/device_utils_network.go            | 24 +++----
 lxd/device/device_utils_proxy.go              |  6 +-
 lxd/device/device_utils_unix.go               | 12 ++--
 lxd/device/device_utils_unix_events.go        | 12 ++--
 .../device_utils_unix_hotplug_events.go       | 10 +--
 lxd/device/device_utils_usb_events.go         | 10 +--
 lxd/device/disk.go                            | 34 ++++-----
 lxd/device/gpu.go                             | 12 ++--
 lxd/device/infiniband_physical.go             | 12 ++--
 lxd/device/infiniband_sriov.go                | 14 ++--
 lxd/device/nic.go                             |  2 +-
 lxd/device/nic_bridged.go                     | 34 ++++-----
 lxd/device/nic_ipvlan.go                      | 14 ++--
 lxd/device/nic_macvlan.go                     | 16 ++---
 lxd/device/nic_ovn.go                         | 26 +++----
 lxd/device/nic_p2p.go                         | 12 ++--
 lxd/device/nic_physical.go                    | 14 ++--
 lxd/device/nic_routed.go                      | 14 ++--
 lxd/device/nic_sriov.go                       | 18 ++---
 lxd/device/nictype/nictype.go                 |  6 +-
 lxd/device/none.go                            |  4 +-
 lxd/device/proxy.go                           | 22 +++---
 lxd/device/tpm.go                             | 16 ++---
 lxd/device/unix_common.go                     | 12 ++--
 lxd/device/unix_hotplug.go                    | 10 +--
 lxd/device/usb.go                             | 12 ++--
 lxd/devices.go                                | 22 +++---
 lxd/devlxd.go                                 | 20 +++---
 lxd/devlxd_test.go                            |  4 +-
 lxd/dnsmasq/dhcpalloc/dhcpalloc.go            | 10 +--
 lxd/dnsmasq/dnsmasq.go                        |  8 +--
 lxd/endpoints/cluster.go                      |  4 +-
 lxd/endpoints/devlxd_test.go                  |  2 +-
 lxd/endpoints/endpoints.go                    |  8 +--
 lxd/endpoints/endpoints_exported_test.go      |  4 +-
 lxd/endpoints/endpoints_test.go               | 10 +--
 lxd/endpoints/local_test.go                   |  2 +-
 lxd/endpoints/network.go                      |  6 +-
 lxd/endpoints/network_test.go                 |  2 +-
 lxd/endpoints/pprof.go                        |  4 +-
 lxd/endpoints/socket.go                       |  6 +-
 lxd/events.go                                 |  8 +--
 lxd/events/events.go                          |  6 +-
 lxd/events/logging.go                         |  4 +-
 lxd/filter/clause.go                          |  2 +-
 lxd/filter/clause_test.go                     |  2 +-
 lxd/filter/match_test.go                      |  4 +-
 lxd/filter/value_test.go                      |  4 +-
 lxd/firewall/drivers/drivers_nftables.go      |  8 +--
 lxd/firewall/drivers/drivers_xtables.go       | 10 +--
 lxd/firewall/firewall_interface.go            |  2 +-
 lxd/firewall/firewall_load.go                 |  4 +-
 lxd/images.go                                 | 44 ++++++------
 lxd/init.go                                   | 10 +--
 lxd/instance.go                               | 30 ++++----
 lxd/instance/drivers/driver_common.go         | 12 ++--
 lxd/instance/drivers/driver_lxc.go            | 68 +++++++++---------
 lxd/instance/drivers/driver_lxc_cmd.go        |  4 +-
 lxd/instance/drivers/driver_qemu.go           | 72 +++++++++----------
 lxd/instance/drivers/driver_qemu_cmd.go       |  6 +-
 lxd/instance/drivers/load.go                  | 16 ++---
 lxd/instance/drivers/qmp/monitor.go           |  2 +-
 lxd/instance/drivers/test_util.go             |  4 +-
 lxd/instance/filter.go                        |  4 +-
 lxd/instance/instance_interface.go            | 16 ++---
 lxd/instance/instance_utils.go                | 32 ++++-----
 lxd/instance/instancetype/instance_type.go    |  2 +-
 lxd/instance_backup.go                        | 18 ++---
 lxd/instance_console.go                       | 22 +++---
 lxd/instance_delete.go                        |  8 +--
 lxd/instance_exec.go                          | 28 ++++----
 lxd/instance_file.go                          |  6 +-
 lxd/instance_get.go                           |  4 +-
 lxd/instance_instance_types.go                | 18 ++---
 lxd/instance_logs.go                          | 10 +--
 lxd/instance_metadata.go                      | 10 +--
 lxd/instance_patch.go                         | 18 ++---
 lxd/instance_post.go                          | 26 +++----
 lxd/instance_put.go                           | 22 +++---
 lxd/instance_snapshot.go                      | 24 +++----
 lxd/instance_state.go                         | 14 ++--
 lxd/instance_test.go                          | 20 +++---
 lxd/instances.go                              | 14 ++--
 lxd/instances_get.go                          | 22 +++---
 lxd/instances_post.go                         | 32 ++++-----
 lxd/logging.go                                | 22 +++---
 lxd/maas/controller.go                        |  2 +-
 lxd/main.go                                   | 16 ++---
 lxd/main_activateifneeded.go                  | 16 ++---
 lxd/main_callhook.go                          |  2 +-
 lxd/main_checkfeature.go                      |  6 +-
 lxd/main_cluster.go                           | 14 ++--
 lxd/main_daemon.go                            |  4 +-
 lxd/main_forkdns.go                           | 10 +--
 lxd/main_forkexec.go                          |  2 +-
 lxd/main_forkmount.go                         |  2 +-
 lxd/main_forknet.go                           |  6 +-
 lxd/main_forkproxy.go                         | 12 ++--
 lxd/main_forkproxy_test.go                    |  4 +-
 lxd/main_forkstart.go                         |  2 +-
 lxd/main_forksyscall.go                       |  2 +-
 lxd/main_forkzfs.go                           |  2 +-
 lxd/main_import.go                            |  2 +-
 lxd/main_init.go                              | 14 ++--
 lxd/main_init_auto.go                         | 12 ++--
 lxd/main_init_dump.go                         |  6 +-
 lxd/main_init_interactive.go                  | 22 +++---
 lxd/main_init_preseed.go                      |  2 +-
 lxd/main_manpage.go                           |  2 +-
 lxd/main_migratedumpsuccess.go                |  4 +-
 lxd/main_netcat.go                            |  4 +-
 lxd/main_nsexec.go                            |  2 +-
 lxd/main_shutdown.go                          |  2 +-
 lxd/main_sql.go                               |  4 +-
 lxd/main_test.go                              | 10 +--
 lxd/main_version.go                           |  4 +-
 lxd/main_waitready.go                         |  4 +-
 lxd/migrate.go                                | 12 ++--
 lxd/migrate_instance.go                       | 26 +++----
 lxd/migrate_storage_volumes.go                | 16 ++---
 lxd/migration/migration_volumes.go            |  8 +--
 lxd/migration/wsproto.go                      |  2 +-
 lxd/network/driver_bridge.go                  | 32 ++++-----
 lxd/network/driver_common.go                  | 20 +++---
 lxd/network/driver_macvlan.go                 | 12 ++--
 lxd/network/driver_ovn.go                     | 26 +++----
 lxd/network/driver_physical.go                | 16 ++---
 lxd/network/driver_sriov.go                   | 12 ++--
 lxd/network/network_interface.go              | 10 +--
 lxd/network/network_load.go                   |  2 +-
 lxd/network/network_utils.go                  | 28 ++++----
 lxd/network/network_utils_bridge.go           |  4 +-
 lxd/network/openvswitch/ovn.go                |  2 +-
 lxd/network/openvswitch/ovs.go                |  2 +-
 lxd/networks.go                               | 34 ++++-----
 lxd/networks_utils.go                         | 16 ++---
 lxd/node/config.go                            |  6 +-
 lxd/node/config_test.go                       |  4 +-
 lxd/node/raft.go                              |  2 +-
 lxd/node/raft_test.go                         |  4 +-
 lxd/operations.go                             | 22 +++---
 lxd/operations/linux.go                       |  2 +-
 lxd/operations/notlinux.go                    |  2 +-
 lxd/operations/operations.go                  | 18 ++---
 lxd/operations/response.go                    |  8 +--
 lxd/operations/websocket.go                   |  4 +-
 lxd/patches.go                                | 32 ++++-----
 lxd/patches_utils.go                          | 10 +--
 lxd/profiles.go                               | 24 +++----
 lxd/profiles_utils.go                         | 14 ++--
 lxd/project/permissions.go                    | 12 ++--
 lxd/project/permissions_test.go               |  8 +--
 lxd/project/project.go                        |  6 +-
 lxd/project/project_test.go                   |  2 +-
 lxd/rbac/server.go                            |  4 +-
 lxd/resources.go                              |  8 +--
 lxd/resources/cpu.go                          |  2 +-
 lxd/resources/gpu.go                          |  2 +-
 lxd/resources/memory.go                       |  4 +-
 lxd/resources/network.go                      |  2 +-
 lxd/resources/network_ethtool.go              |  2 +-
 lxd/resources/pci.go                          |  2 +-
 lxd/resources/resources.go                    |  2 +-
 lxd/resources/storage.go                      |  2 +-
 lxd/resources/system.go                       |  2 +-
 lxd/resources/usb.go                          |  4 +-
 lxd/response.go                               |  6 +-
 lxd/response/response.go                      |  8 +--
 lxd/response/smart.go                         |  2 +-
 lxd/response/smart_linux.go                   |  2 +-
 lxd/revert/revert_test.go                     |  2 +-
 lxd/rsync/rsync.go                            |  8 +--
 lxd/seccomp/seccomp.go                        | 26 +++----
 lxd/state/notlinux.go                         |  2 +-
 lxd/state/state.go                            | 12 ++--
 lxd/state/testing.go                          |  6 +-
 lxd/storage.go                                | 18 ++---
 lxd/storage/backend_lxd.go                    | 38 +++++-----
 lxd/storage/backend_lxd_patches.go            | 14 ++--
 lxd/storage/backend_mock.go                   | 18 ++---
 lxd/storage/drivers/driver_btrfs.go           | 14 ++--
 lxd/storage/drivers/driver_btrfs_utils.go     |  8 +--
 lxd/storage/drivers/driver_btrfs_volumes.go   | 18 ++---
 lxd/storage/drivers/driver_ceph.go            | 16 ++---
 lxd/storage/drivers/driver_ceph_utils.go      | 10 +--
 lxd/storage/drivers/driver_ceph_volumes.go    | 22 +++---
 lxd/storage/drivers/driver_cephfs.go          | 10 +--
 lxd/storage/drivers/driver_cephfs_utils.go    |  2 +-
 lxd/storage/drivers/driver_cephfs_volumes.go  | 16 ++---
 lxd/storage/drivers/driver_common.go          | 10 +--
 lxd/storage/drivers/driver_dir.go             |  6 +-
 lxd/storage/drivers/driver_dir_utils.go       |  8 +--
 lxd/storage/drivers/driver_dir_volumes.go     | 18 ++---
 lxd/storage/drivers/driver_lvm.go             | 14 ++--
 lxd/storage/drivers/driver_lvm_patches.go     |  4 +-
 lxd/storage/drivers/driver_lvm_utils.go       | 14 ++--
 lxd/storage/drivers/driver_lvm_volumes.go     | 18 ++---
 lxd/storage/drivers/driver_zfs.go             | 16 ++---
 lxd/storage/drivers/driver_zfs_patches.go     |  2 +-
 lxd/storage/drivers/driver_zfs_utils.go       |  6 +-
 lxd/storage/drivers/driver_zfs_volumes.go     | 20 +++---
 lxd/storage/drivers/drivers_mock.go           | 10 +--
 lxd/storage/drivers/generic_vfs.go            | 22 +++---
 lxd/storage/drivers/interface.go              | 14 ++--
 lxd/storage/drivers/load.go                   |  4 +-
 lxd/storage/drivers/utils.go                  |  6 +-
 lxd/storage/drivers/utils_cgo.go              |  2 +-
 lxd/storage/drivers/volume.go                 | 12 ++--
 lxd/storage/load.go                           | 20 +++---
 lxd/storage/pool_interface.go                 | 14 ++--
 lxd/storage/quota/projectquota.go             |  2 +-
 lxd/storage/storage.go                        |  6 +-
 lxd/storage/utils.go                          | 38 +++++-----
 lxd/storage_migration.go                      | 10 +--
 lxd/storage_pools.go                          | 18 ++---
 lxd/storage_pools_config.go                   |  8 +--
 lxd/storage_pools_utils.go                    |  8 +--
 lxd/storage_volumes.go                        | 30 ++++----
 lxd/storage_volumes_backup.go                 | 20 +++---
 lxd/storage_volumes_snapshot.go               | 26 +++----
 lxd/storage_volumes_utils.go                  | 18 ++---
 lxd/sys/apparmor.go                           |  8 +--
 lxd/sys/os.go                                 | 12 ++--
 lxd/task/group_test.go                        |  2 +-
 lxd/task/task_test.go                         |  2 +-
 lxd/util/config.go                            |  2 +-
 lxd/util/config_test.go                       |  2 +-
 lxd/util/encryption.go                        |  2 +-
 lxd/util/fs.go                                |  2 +-
 lxd/util/http.go                              |  6 +-
 lxd/util/kernel.go                            |  2 +-
 lxd/util/net.go                               |  4 +-
 lxd/util/net_test.go                          |  2 +-
 lxd/util/sys.go                               |  8 +--
 lxd/vsock/vsock.go                            |  2 +-
 shared/archive_linux.go                       |  4 +-
 shared/cert_test.go                           |  2 +-
 shared/cmd/ask.go                             |  2 +-
 shared/eagain/file_unix.go                    |  2 +-
 shared/generate/db.go                         |  6 +-
 shared/generate/db/constants.go               |  6 +-
 shared/generate/db/lex.go                     |  2 +-
 shared/generate/db/mapping.go                 |  4 +-
 shared/generate/db/method.go                  |  4 +-
 shared/generate/db/parse.go                   |  6 +-
 shared/generate/db/parse_test.go              |  2 +-
 shared/generate/db/schema.go                  |  4 +-
 shared/generate/db/stmt.go                    |  4 +-
 shared/generate/lex/parse_test.go             |  4 +-
 shared/idmap/idmapset_linux.go                |  4 +-
 shared/idmap/shift_linux.go                   |  6 +-
 shared/instance.go                            |  4 +-
 shared/instancewriter/instance_tar_writer.go  |  6 +-
 shared/json.go                                |  2 +-
 shared/log15/handler.go                       |  2 +-
 shared/log15/root.go                          |  2 +-
 shared/logging/format.go                      |  2 +-
 shared/logging/log.go                         |  6 +-
 shared/logging/log_posix.go                   |  2 +-
 shared/logging/log_windows.go                 |  2 +-
 shared/logging/testing.go                     |  2 +-
 shared/netutils/network_linux.go              |  4 +-
 shared/netutils/network_linux_cgo.go          |  2 +-
 shared/network.go                             |  4 +-
 shared/osarch/architectures_linux.go          |  2 +-
 shared/osarch/tempfile_test.go                |  2 +-
 shared/simplestreams/products.go              |  6 +-
 shared/simplestreams/simplestreams.go         |  6 +-
 shared/simplestreams/sort.go                  |  4 +-
 shared/subprocess/proc.go                     |  2 +-
 shared/termios/termios_unix.go                |  2 +-
 shared/util.go                                |  6 +-
 shared/util_linux.go                          |  4 +-
 shared/util_linux_cgo.go                      |  2 +-
 shared/validate/validate.go                   |  2 +-
 shared/validate/validate_test.go              |  2 +-
 shared/version/platform_linux.go              |  4 +-
 shared/version/useragent.go                   |  2 +-
 515 files changed, 2251 insertions(+), 2251 deletions(-)

diff --git a/client/connection.go b/client/connection.go
index 2f77391555..e006546429 100644
--- a/client/connection.go
+++ b/client/connection.go
@@ -12,9 +12,9 @@ import (
 
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/simplestreams"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/simplestreams"
 )
 
 // ConnectionArgs represents a set of common connection properties
diff --git a/client/events.go b/client/events.go
index ded9902d06..b0361a5495 100644
--- a/client/events.go
+++ b/client/events.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // The EventListener struct is used to interact with a LXD event stream
diff --git a/client/interfaces.go b/client/interfaces.go
index 531a4aa9d4..85a84a73ee 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
 )
 
 // The Operation type represents a currently running operation.
diff --git a/client/lxd.go b/client/lxd.go
index 175e32ab56..220f7bc900 100644
--- a/client/lxd.go
+++ b/client/lxd.go
@@ -13,9 +13,9 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 
 	neturl "net/url"
 )
diff --git a/client/lxd_certificates.go b/client/lxd_certificates.go
index e1196a907e..9825945285 100644
--- a/client/lxd_certificates.go
+++ b/client/lxd_certificates.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Certificate handling functions
diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go
index 589c33cead..f67940b64f 100644
--- a/client/lxd_cluster.go
+++ b/client/lxd_cluster.go
@@ -3,7 +3,7 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // GetCluster returns information about a cluster
diff --git a/client/lxd_containers.go b/client/lxd_containers.go
index 7a524c58c7..61fa5a3b8a 100644
--- a/client/lxd_containers.go
+++ b/client/lxd_containers.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Container handling functions
diff --git a/client/lxd_events.go b/client/lxd_events.go
index 08f838695b..1768316544 100644
--- a/client/lxd_events.go
+++ b/client/lxd_events.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Event handling functions
diff --git a/client/lxd_images.go b/client/lxd_images.go
index 1e148ec926..05b20bbe5e 100644
--- a/client/lxd_images.go
+++ b/client/lxd_images.go
@@ -12,11 +12,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Image handling functions
diff --git a/client/lxd_instances.go b/client/lxd_instances.go
index a7d6e85bca..0195d7504d 100644
--- a/client/lxd_instances.go
+++ b/client/lxd_instances.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Instance handling functions.
diff --git a/client/lxd_networks.go b/client/lxd_networks.go
index cbc5a247ab..a5cc8d723f 100644
--- a/client/lxd_networks.go
+++ b/client/lxd_networks.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // GetNetworkNames returns a list of network names
diff --git a/client/lxd_operations.go b/client/lxd_operations.go
index 1ef13da1ae..1452432e66 100644
--- a/client/lxd_operations.go
+++ b/client/lxd_operations.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // GetOperationUUIDs returns a list of operation uuids
diff --git a/client/lxd_profiles.go b/client/lxd_profiles.go
index 18313866a0..8f6b48b937 100644
--- a/client/lxd_profiles.go
+++ b/client/lxd_profiles.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Profile handling functions
diff --git a/client/lxd_projects.go b/client/lxd_projects.go
index bd80d25fcc..369c94bd6f 100644
--- a/client/lxd_projects.go
+++ b/client/lxd_projects.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Project handling functions
diff --git a/client/lxd_server.go b/client/lxd_server.go
index 3bd168679a..d3167066ba 100644
--- a/client/lxd_server.go
+++ b/client/lxd_server.go
@@ -3,8 +3,8 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Server handling functions
diff --git a/client/lxd_storage_pools.go b/client/lxd_storage_pools.go
index 8449f42501..bd1831ae65 100644
--- a/client/lxd_storage_pools.go
+++ b/client/lxd_storage_pools.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Storage pool handling functions
diff --git a/client/lxd_storage_volumes.go b/client/lxd_storage_volumes.go
index ceb85f91c6..e12ba0c882 100644
--- a/client/lxd_storage_volumes.go
+++ b/client/lxd_storage_volumes.go
@@ -7,10 +7,10 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Storage volumes handling function
diff --git a/client/operations.go b/client/operations.go
index 3b35e9f885..e99145098f 100644
--- a/client/operations.go
+++ b/client/operations.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // The Operation type represents an ongoing LXD operation (asynchronous processing)
diff --git a/client/simplestreams.go b/client/simplestreams.go
index 7a73bc3ac1..205661d6e1 100644
--- a/client/simplestreams.go
+++ b/client/simplestreams.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/grant-he/lxd/shared/simplestreams"
+	"github.com/lxc/lxd/shared/simplestreams"
 )
 
 // ProtocolSimpleStreams implements a SimpleStreams API client
diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go
index 7716e8f21a..d720f0321b 100644
--- a/client/simplestreams_images.go
+++ b/client/simplestreams_images.go
@@ -10,8 +10,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Image handling functions
diff --git a/client/util.go b/client/util.go
index 8b1b9c240c..6c34f390f0 100644
--- a/client/util.go
+++ b/client/util.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 func tlsHTTPClient(client *http.Client, tlsClientCert string, tlsClientKey string, tlsCA string, tlsServerCert string, insecureSkipVerify bool, proxy func(req *http.Request) (*url.URL, error)) (*http.Client, error) {
diff --git a/fuidshift/main.go b/fuidshift/main.go
index 59f7b8db7a..4fc45d9d96 100644
--- a/fuidshift/main.go
+++ b/fuidshift/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/fuidshift/main_shift.go b/fuidshift/main_shift.go
index 8d4a0b311e..98fe525acd 100644
--- a/fuidshift/main_shift.go
+++ b/fuidshift/main_shift.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/idmap"
 )
 
 type cmdShift struct {
diff --git a/lxc-to-lxd/config.go b/lxc-to-lxd/config.go
index fef4dcab4e..ca256839ab 100644
--- a/lxc-to-lxd/config.go
+++ b/lxc-to-lxd/config.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 var checkedKeys = []string{
diff --git a/lxc-to-lxd/main.go b/lxc-to-lxd/main.go
index be21d7cfe0..a350214eda 100644
--- a/lxc-to-lxd/main.go
+++ b/lxc-to-lxd/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxc-to-lxd/main_migrate.go b/lxc-to-lxd/main_migrate.go
index fc26a627a2..7937b847f0 100644
--- a/lxc-to-lxd/main_migrate.go
+++ b/lxc-to-lxd/main_migrate.go
@@ -11,12 +11,12 @@ import (
 	"github.com/spf13/cobra"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/osarch"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 type cmdMigrate struct {
diff --git a/lxc-to-lxd/main_netcat.go b/lxc-to-lxd/main_netcat.go
index 20e33f7812..db21bed71a 100644
--- a/lxc-to-lxd/main_netcat.go
+++ b/lxc-to-lxd/main_netcat.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/eagain"
+	"github.com/lxc/lxd/shared/eagain"
 )
 
 type cmdNetcat struct {
diff --git a/lxc-to-lxd/transfer.go b/lxc-to-lxd/transfer.go
index 3939f82531..abcae89bc4 100644
--- a/lxc-to-lxd/transfer.go
+++ b/lxc-to-lxd/transfer.go
@@ -12,9 +12,9 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/shared"
 )
 
 // Send an rsync stream of a path over a websocket
diff --git a/lxc-to-lxd/utils.go b/lxc-to-lxd/utils.go
index 889e40bbb1..5365549251 100644
--- a/lxc-to-lxd/utils.go
+++ b/lxc-to-lxd/utils.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/migration"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/migration"
 )
 
 func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error {
diff --git a/lxc/action.go b/lxc/action.go
index 30a7ef2904..292a82372a 100644
--- a/lxc/action.go
+++ b/lxc/action.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 // Start
diff --git a/lxc/alias.go b/lxc/alias.go
index fcfb3c5f82..e25e518aea 100644
--- a/lxc/alias.go
+++ b/lxc/alias.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/utils"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdAlias struct {
diff --git a/lxc/cluster.go b/lxc/cluster.go
index d9530c5de2..2844acc0fa 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -12,12 +12,12 @@ import (
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdCluster struct {
diff --git a/lxc/config.go b/lxc/config.go
index 9ea8b77166..e0dd0fcac5 100644
--- a/lxc/config.go
+++ b/lxc/config.go
@@ -9,12 +9,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdConfig struct {
diff --git a/lxc/config/cert.go b/lxc/config/cert.go
index 88a688afcc..42ccf8312a 100644
--- a/lxc/config/cert.go
+++ b/lxc/config/cert.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // HasClientCertificate will return true if a client certificate has already been generated
diff --git a/lxc/config/file.go b/lxc/config/file.go
index 86c4c76f82..ac58bec39e 100644
--- a/lxc/config/file.go
+++ b/lxc/config/file.go
@@ -8,7 +8,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // LoadConfig reads the configuration from the config path; if the path does
diff --git a/lxc/config/remote.go b/lxc/config/remote.go
index 454db9ba08..40f64a9d9c 100644
--- a/lxc/config/remote.go
+++ b/lxc/config/remote.go
@@ -15,8 +15,8 @@ import (
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery/form"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared"
 )
 
 // Remote holds details for communication with a remote daemon
diff --git a/lxc/config_device.go b/lxc/config_device.go
index 2b642da71f..d6dab2e83a 100644
--- a/lxc/config_device.go
+++ b/lxc/config_device.go
@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdConfigDevice struct {
diff --git a/lxc/config_metadata.go b/lxc/config_metadata.go
index 1d12ff21ae..f99cc9f940 100644
--- a/lxc/config_metadata.go
+++ b/lxc/config_metadata.go
@@ -8,11 +8,11 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdConfigMetadata struct {
diff --git a/lxc/config_template.go b/lxc/config_template.go
index 0533dfb038..8e7ce7daa7 100644
--- a/lxc/config_template.go
+++ b/lxc/config_template.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdConfigTemplate struct {
diff --git a/lxc/config_trust.go b/lxc/config_trust.go
index 40fc5e6b2d..bd95a9bc40 100644
--- a/lxc/config_trust.go
+++ b/lxc/config_trust.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdConfigTrust struct {
diff --git a/lxc/console.go b/lxc/console.go
index a48a6f2008..907c39976c 100644
--- a/lxc/console.go
+++ b/lxc/console.go
@@ -13,13 +13,13 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdConsole struct {
diff --git a/lxc/console_unix.go b/lxc/console_unix.go
index 050be5e8e3..44c7ee672d 100644
--- a/lxc/console_unix.go
+++ b/lxc/console_unix.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func (c *cmdConsole) controlSocketHandler(control *websocket.Conn) {
diff --git a/lxc/copy.go b/lxc/copy.go
index 517e7a78ba..7b88270ee4 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdCopy struct {
diff --git a/lxc/delete.go b/lxc/delete.go
index cbde4405cc..5aad5dfe4c 100644
--- a/lxc/delete.go
+++ b/lxc/delete.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdDelete struct {
diff --git a/lxc/exec.go b/lxc/exec.go
index 0d709ffa0d..5d1db23c37 100644
--- a/lxc/exec.go
+++ b/lxc/exec.go
@@ -12,12 +12,12 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdExec struct {
diff --git a/lxc/exec_unix.go b/lxc/exec_unix.go
index d370c46234..91b62ad209 100644
--- a/lxc/exec_unix.go
+++ b/lxc/exec_unix.go
@@ -9,8 +9,8 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func (c *cmdExec) getTERM() (string, bool) {
diff --git a/lxc/exec_windows.go b/lxc/exec_windows.go
index d3a087f429..af87dc7a3d 100644
--- a/lxc/exec_windows.go
+++ b/lxc/exec_windows.go
@@ -10,8 +10,8 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/windows"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Windows doesn't process ANSI sequences natively, so we wrap
diff --git a/lxc/export.go b/lxc/export.go
index ccba1847bd..d670a194fc 100644
--- a/lxc/export.go
+++ b/lxc/export.go
@@ -9,12 +9,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdExport struct {
diff --git a/lxc/file.go b/lxc/file.go
index 9527e1dd5a..dda9cc749b 100644
--- a/lxc/file.go
+++ b/lxc/file.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/termios"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/termios"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type cmdFile struct {
diff --git a/lxc/image.go b/lxc/image.go
index 7138eced2f..1d1900174f 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -13,13 +13,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type imageColumn struct {
diff --git a/lxc/image_alias.go b/lxc/image_alias.go
index ecb1dafca9..b7e941b84e 100644
--- a/lxc/image_alias.go
+++ b/lxc/image_alias.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdImageAlias struct {
diff --git a/lxc/import.go b/lxc/import.go
index ff209fd511..0671b50f76 100644
--- a/lxc/import.go
+++ b/lxc/import.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type cmdImport struct {
diff --git a/lxc/info.go b/lxc/info.go
index a5c38a32b2..b1be66ff43 100644
--- a/lxc/info.go
+++ b/lxc/info.go
@@ -9,13 +9,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type cmdInfo struct {
diff --git a/lxc/init.go b/lxc/init.go
index cafb532914..96a005b85a 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -9,13 +9,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdInit struct {
diff --git a/lxc/launch.go b/lxc/launch.go
index 631a2c8a78..052f9c9c10 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdLaunch struct {
diff --git a/lxc/list.go b/lxc/list.go
index 3297140276..e5aea95301 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/spf13/cobra"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/units"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type column struct {
diff --git a/lxc/list_test.go b/lxc/list_test.go
index 7fadb646b8..5bb084e044 100644
--- a/lxc/list_test.go
+++ b/lxc/list_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func TestDotPrefixMatch(t *testing.T) {
diff --git a/lxc/main.go b/lxc/main.go
index 05858450c9..902c0ecea5 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/shared"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/shared"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxc/main_aliases.go b/lxc/main_aliases.go
index 1f3a216541..fd37122339 100644
--- a/lxc/main_aliases.go
+++ b/lxc/main_aliases.go
@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 // defaultAliases contains LXC's built-in command line aliases.  The built-in
diff --git a/lxc/main_test.go b/lxc/main_test.go
index b3c4eba2c4..9165bc26a3 100644
--- a/lxc/main_test.go
+++ b/lxc/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxc/config"
+	"github.com/lxc/lxd/lxc/config"
 )
 
 type aliasTestcase struct {
diff --git a/lxc/manpage.go b/lxc/manpage.go
index c3c7f9a0ea..f7f065832b 100644
--- a/lxc/manpage.go
+++ b/lxc/manpage.go
@@ -4,9 +4,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	"github.com/grant-he/lxd/shared"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdManpage struct {
diff --git a/lxc/monitor.go b/lxc/monitor.go
index 989d86563d..b777e8a57d 100644
--- a/lxc/monitor.go
+++ b/lxc/monitor.go
@@ -7,12 +7,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 type cmdMonitor struct {
diff --git a/lxc/move.go b/lxc/move.go
index 6cc2aa3be7..f77bf6f222 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxc/network.go b/lxc/network.go
index a7d4d970a5..41c2f6e549 100644
--- a/lxc/network.go
+++ b/lxc/network.go
@@ -10,13 +10,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type cmdNetwork struct {
diff --git a/lxc/operation.go b/lxc/operation.go
index 324e828db7..1f2965e7e6 100644
--- a/lxc/operation.go
+++ b/lxc/operation.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/lxc/utils"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdOperation struct {
diff --git a/lxc/profile.go b/lxc/profile.go
index be4855b8fb..7bf56518b7 100644
--- a/lxc/profile.go
+++ b/lxc/profile.go
@@ -10,12 +10,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdProfile struct {
diff --git a/lxc/project.go b/lxc/project.go
index 0331c84146..194ad0c52e 100644
--- a/lxc/project.go
+++ b/lxc/project.go
@@ -10,12 +10,12 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdProject struct {
diff --git a/lxc/publish.go b/lxc/publish.go
index 36ffd3a3e4..ff1e3575b4 100644
--- a/lxc/publish.go
+++ b/lxc/publish.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 type cmdPublish struct {
diff --git a/lxc/query.go b/lxc/query.go
index 95340c39d6..29e58de88a 100644
--- a/lxc/query.go
+++ b/lxc/query.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdQuery struct {
diff --git a/lxc/remote.go b/lxc/remote.go
index b10d68dcf5..aa34772bc4 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -13,13 +13,13 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdRemote struct {
diff --git a/lxc/rename.go b/lxc/rename.go
index dc255a50b3..603c305725 100644
--- a/lxc/rename.go
+++ b/lxc/rename.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdRename struct {
diff --git a/lxc/restore.go b/lxc/restore.go
index 51165d4154..b40440edeb 100644
--- a/lxc/restore.go
+++ b/lxc/restore.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 type cmdRestore struct {
diff --git a/lxc/snapshot.go b/lxc/snapshot.go
index 45a0d86080..f49e9a8ded 100644
--- a/lxc/snapshot.go
+++ b/lxc/snapshot.go
@@ -3,10 +3,10 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
 
 	"fmt"
 	"strings"
diff --git a/lxc/storage.go b/lxc/storage.go
index ca2a8cef71..c7d881d7d4 100644
--- a/lxc/storage.go
+++ b/lxc/storage.go
@@ -11,13 +11,13 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type cmdStorage struct {
diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go
index ff0028a78b..e8a3335601 100644
--- a/lxc/storage_volume.go
+++ b/lxc/storage_volume.go
@@ -14,15 +14,15 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/termios"
-	"github.com/grant-he/lxd/shared/units"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/termios"
+	"github.com/lxc/lxd/shared/units"
 )
 
 type cmdStorageVolume struct {
diff --git a/lxc/utils.go b/lxc/utils.go
index ba32ca1d3d..a5e5091c51 100644
--- a/lxc/utils.go
+++ b/lxc/utils.go
@@ -10,10 +10,10 @@ import (
 	"github.com/fvbommel/sortorder"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/termios"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type stringList [][]string
diff --git a/lxc/utils/cancel.go b/lxc/utils/cancel.go
index 42d0105ced..0b0a684288 100644
--- a/lxc/utils/cancel.go
+++ b/lxc/utils/cancel.go
@@ -6,8 +6,8 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 // CancelableWait waits for an operation and cancel it on SIGINT/SIGTERM
diff --git a/lxc/utils/progress.go b/lxc/utils/progress.go
index 7f5827dbc8..1a548d7539 100644
--- a/lxc/utils/progress.go
+++ b/lxc/utils/progress.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 // ProgressRenderer tracks the progress information
diff --git a/lxc/utils/table.go b/lxc/utils/table.go
index c91c78c45c..4cf9ae50c3 100644
--- a/lxc/utils/table.go
+++ b/lxc/utils/table.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/grant-he/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/i18n"
 	"github.com/olekukonko/tablewriter"
 	"gopkg.in/yaml.v2"
 )
diff --git a/lxc/utils_test.go b/lxc/utils_test.go
index 85123716ae..f8ad029e73 100644
--- a/lxc/utils_test.go
+++ b/lxc/utils_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type utilsTestSuite struct {
diff --git a/lxc/version.go b/lxc/version.go
index 7acc533f7e..ff562247cc 100644
--- a/lxc/version.go
+++ b/lxc/version.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/i18n"
-	"github.com/grant-he/lxd/shared/version"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdVersion struct {
diff --git a/lxd-agent/api.go b/lxd-agent/api.go
index 244a6bb1da..33ed7d9722 100644
--- a/lxd-agent/api.go
+++ b/lxd-agent/api.go
@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/grant-he/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/response"
 )
 
 // APIEndpoint represents a URL in our API.
diff --git a/lxd-agent/api_1.0.go b/lxd-agent/api_1.0.go
index a8460855e2..ccae95060f 100644
--- a/lxd-agent/api_1.0.go
+++ b/lxd-agent/api_1.0.go
@@ -4,10 +4,10 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/grant-he/lxd/lxd/response"
-	lxdshared "github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/response"
+	lxdshared "github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var api10Cmd = APIEndpoint{
diff --git a/lxd-agent/daemon.go b/lxd-agent/daemon.go
index e9a39e8ba3..9b4844a800 100644
--- a/lxd-agent/daemon.go
+++ b/lxd-agent/daemon.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/grant-he/lxd/lxd/events"
+	"github.com/lxc/lxd/lxd/events"
 )
 
 // A Daemon can respond to requests from a shared client.
diff --git a/lxd-agent/devlxd.go b/lxd-agent/devlxd.go
index 79d074513e..c96a17b0fb 100644
--- a/lxd-agent/devlxd.go
+++ b/lxd-agent/devlxd.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // DevLxdServer creates an http.Server capable of handling requests against the
diff --git a/lxd-agent/events.go b/lxd-agent/events.go
index b23e65c50f..cd2b1cbacd 100644
--- a/lxd-agent/events.go
+++ b/lxd-agent/events.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var eventsCmd = APIEndpoint{
diff --git a/lxd-agent/exec.go b/lxd-agent/exec.go
index 38bc0dc511..35310ffef2 100644
--- a/lxd-agent/exec.go
+++ b/lxd-agent/exec.go
@@ -14,13 +14,13 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/netutils"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/netutils"
 )
 
 var execCmd = APIEndpoint{
diff --git a/lxd-agent/file.go b/lxd-agent/file.go
index 2c8020dd33..19a5cd00e1 100644
--- a/lxd-agent/file.go
+++ b/lxd-agent/file.go
@@ -10,8 +10,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
 )
 
 var fileCmd = APIEndpoint{
diff --git a/lxd-agent/main.go b/lxd-agent/main.go
index 614260d54c..be4cfeefa3 100644
--- a/lxd-agent/main.go
+++ b/lxd-agent/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxd-agent/main_agent.go b/lxd-agent/main_agent.go
index 341dd94d32..4d826813aa 100644
--- a/lxd-agent/main_agent.go
+++ b/lxd-agent/main_agent.go
@@ -16,12 +16,12 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/lxd/vsock"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/lxd/vsock"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 type cmdAgent struct {
diff --git a/lxd-agent/network.go b/lxd-agent/network.go
index 82121882bd..e018493764 100644
--- a/lxd-agent/network.go
+++ b/lxd-agent/network.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 // A variation of the standard tls.Listener that supports atomically swapping
diff --git a/lxd-agent/operations.go b/lxd-agent/operations.go
index fcff00ca32..3c8f033f13 100644
--- a/lxd-agent/operations.go
+++ b/lxd-agent/operations.go
@@ -8,11 +8,11 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var operationCmd = APIEndpoint{
diff --git a/lxd-agent/server.go b/lxd-agent/server.go
index 2c3b1929d2..4f7b9e1505 100644
--- a/lxd-agent/server.go
+++ b/lxd-agent/server.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func restServer(tlsConfig *tls.Config, cert *x509.Certificate, debug bool, d *Daemon) *http.Server {
diff --git a/lxd-agent/state.go b/lxd-agent/state.go
index 9ffbc18e73..ff8292e720 100644
--- a/lxd-agent/state.go
+++ b/lxd-agent/state.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var stateCmd = APIEndpoint{
diff --git a/lxd-agent/templates.go b/lxd-agent/templates.go
index a3fc7cd647..8e49788a4d 100644
--- a/lxd-agent/templates.go
+++ b/lxd-agent/templates.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func templatesApply(path string) ([]string, error) {
diff --git a/lxd-benchmark/benchmark/benchmark.go b/lxd-benchmark/benchmark/benchmark.go
index eff37455b2..2d96f6fdb8 100644
--- a/lxd-benchmark/benchmark/benchmark.go
+++ b/lxd-benchmark/benchmark/benchmark.go
@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/config"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 const userConfigKey = "user.lxd-benchmark"
diff --git a/lxd-benchmark/benchmark/operation.go b/lxd-benchmark/benchmark/operation.go
index 6b7f0435ff..b4f4f3cea7 100644
--- a/lxd-benchmark/benchmark/operation.go
+++ b/lxd-benchmark/benchmark/operation.go
@@ -1,8 +1,8 @@
 package benchmark
 
 import (
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func createContainer(c lxd.ContainerServer, fingerprint string, name string, privileged bool) error {
diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go
index 04a33a8ff4..dcaca97787 100644
--- a/lxd-benchmark/main.go
+++ b/lxd-benchmark/main.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd-benchmark/benchmark"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxd-benchmark/main_delete.go b/lxd-benchmark/main_delete.go
index d0d8ef15da..c9c12f1772 100644
--- a/lxd-benchmark/main_delete.go
+++ b/lxd-benchmark/main_delete.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
+	"github.com/lxc/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdDelete struct {
diff --git a/lxd-benchmark/main_init.go b/lxd-benchmark/main_init.go
index c29fa3536f..7e2068b71d 100644
--- a/lxd-benchmark/main_init.go
+++ b/lxd-benchmark/main_init.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
+	"github.com/lxc/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdInit struct {
diff --git a/lxd-benchmark/main_launch.go b/lxd-benchmark/main_launch.go
index 20fcd8e5ab..1753879279 100644
--- a/lxd-benchmark/main_launch.go
+++ b/lxd-benchmark/main_launch.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
+	"github.com/lxc/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdLaunch struct {
diff --git a/lxd-benchmark/main_start.go b/lxd-benchmark/main_start.go
index 0d98e7f986..c1cc0e3d58 100644
--- a/lxd-benchmark/main_start.go
+++ b/lxd-benchmark/main_start.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
+	"github.com/lxc/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdStart struct {
diff --git a/lxd-benchmark/main_stop.go b/lxd-benchmark/main_stop.go
index b2031bb476..056e0e179c 100644
--- a/lxd-benchmark/main_stop.go
+++ b/lxd-benchmark/main_stop.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxd-benchmark/benchmark"
+	"github.com/lxc/lxd/lxd-benchmark/benchmark"
 )
 
 type cmdStop struct {
diff --git a/lxd-p2c/main.go b/lxd-p2c/main.go
index be21d7cfe0..a350214eda 100644
--- a/lxd-p2c/main.go
+++ b/lxd-p2c/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdGlobal struct {
diff --git a/lxd-p2c/main_migrate.go b/lxd-p2c/main_migrate.go
index 325172fce7..4c934d5ca8 100644
--- a/lxd-p2c/main_migrate.go
+++ b/lxd-p2c/main_migrate.go
@@ -13,9 +13,9 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 type cmdMigrate struct {
diff --git a/lxd-p2c/main_netcat.go b/lxd-p2c/main_netcat.go
index 20e33f7812..db21bed71a 100644
--- a/lxd-p2c/main_netcat.go
+++ b/lxd-p2c/main_netcat.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/eagain"
+	"github.com/lxc/lxd/shared/eagain"
 )
 
 type cmdNetcat struct {
diff --git a/lxd-p2c/transfer.go b/lxd-p2c/transfer.go
index 5b3f862a2f..329c2754f4 100644
--- a/lxd-p2c/transfer.go
+++ b/lxd-p2c/transfer.go
@@ -12,9 +12,9 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/shared"
 )
 
 // Send an rsync stream of a path over a websocket
diff --git a/lxd-p2c/utils.go b/lxd-p2c/utils.go
index 2f42216085..f5c2afe47f 100644
--- a/lxd-p2c/utils.go
+++ b/lxd-p2c/utils.go
@@ -10,11 +10,11 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error {
diff --git a/lxd/api.go b/lxd/api.go
index 0f9f5409d2..2bdcba49d2 100644
--- a/lxd/api.go
+++ b/lxd/api.go
@@ -5,14 +5,14 @@ import (
 	"net/url"
 	"strings"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 
 	"github.com/gorilla/mux"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // RestServer creates an http.Server capable of handling requests against the LXD REST API endpoint.
diff --git a/lxd/api_1.0.go b/lxd/api_1.0.go
index c07b467944..72212579a2 100644
--- a/lxd/api_1.0.go
+++ b/lxd/api_1.0.go
@@ -8,19 +8,19 @@ import (
 
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/config"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index 2fb68d872d..7e88bcce2f 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -14,20 +14,20 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var clusterCmd = APIEndpoint{
diff --git a/lxd/api_cluster_test.go b/lxd/api_cluster_test.go
index f3395857ab..fa280460dd 100644
--- a/lxd/api_cluster_test.go
+++ b/lxd/api_cluster_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/api_internal.go b/lxd/api_internal.go
index 97f2b2904c..b7bb74b6e2 100644
--- a/lxd/api_internal.go
+++ b/lxd/api_internal.go
@@ -15,24 +15,24 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/node"
-	"github.com/grant-he/lxd/lxd/db/query"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/node"
+	"github.com/lxc/lxd/lxd/db/query"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/units"
 )
 
 var apiInternal = []APIEndpoint{
diff --git a/lxd/api_networks_test.go b/lxd/api_networks_test.go
index 5671d09139..4b71c4139b 100644
--- a/lxd/api_networks_test.go
+++ b/lxd/api_networks_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/api_project.go b/lxd/api_project.go
index 3adc107cae..85de1f61b2 100644
--- a/lxd/api_project.go
+++ b/lxd/api_project.go
@@ -12,18 +12,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	projecthelpers "github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/validate"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	projecthelpers "github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // projectFeatures are the features available to projects.
diff --git a/lxd/api_storage_pools_test.go b/lxd/api_storage_pools_test.go
index fb545c96e0..0e291a7be2 100644
--- a/lxd/api_storage_pools_test.go
+++ b/lxd/api_storage_pools_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/apparmor/apparmor.go b/lxd/apparmor/apparmor.go
index 7da3bd11cc..9d8ec55f46 100644
--- a/lxd/apparmor/apparmor.go
+++ b/lxd/apparmor/apparmor.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/version"
 )
 
 const (
diff --git a/lxd/apparmor/instance.go b/lxd/apparmor/instance.go
index 45044c7654..6fd1a2a11e 100644
--- a/lxd/apparmor/instance.go
+++ b/lxd/apparmor/instance.go
@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 // Internal copy of the instance interface.
diff --git a/lxd/apparmor/instance_forkproxy.go b/lxd/apparmor/instance_forkproxy.go
index b93929958a..5518e53b2d 100644
--- a/lxd/apparmor/instance_forkproxy.go
+++ b/lxd/apparmor/instance_forkproxy.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"text/template"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 // Internal copy of the device interface.
diff --git a/lxd/apparmor/network.go b/lxd/apparmor/network.go
index c153e58836..e5b2698c79 100644
--- a/lxd/apparmor/network.go
+++ b/lxd/apparmor/network.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/grant-he/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/state"
 )
 
 // Internal copy of the network interface.
diff --git a/lxd/apparmor/network_dnsmasq.go b/lxd/apparmor/network_dnsmasq.go
index 8993a2b672..bedf098395 100644
--- a/lxd/apparmor/network_dnsmasq.go
+++ b/lxd/apparmor/network_dnsmasq.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
 )
 
 var dnsmasqProfileTpl = template.Must(template.New("dnsmasqProfile").Parse(`#include <tunables/global>
diff --git a/lxd/apparmor/network_forkdns.go b/lxd/apparmor/network_forkdns.go
index ee5dfdeefd..bc5dfecfc9 100644
--- a/lxd/apparmor/network_forkdns.go
+++ b/lxd/apparmor/network_forkdns.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 var forkdnsProfileTpl = template.Must(template.New("forkdnsProfile").Parse(`#include <tunables/global>
diff --git a/lxd/backup.go b/lxd/backup.go
index 3a74d60c9d..23c94064b8 100644
--- a/lxd/backup.go
+++ b/lxd/backup.go
@@ -12,25 +12,25 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/instancewriter"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 // Create a new backup.
diff --git a/lxd/backup/backup_common.go b/lxd/backup/backup_common.go
index 80431b3174..6b298bcdd2 100644
--- a/lxd/backup/backup_common.go
+++ b/lxd/backup/backup_common.go
@@ -3,7 +3,7 @@ package backup
 import (
 	"time"
 
-	"github.com/grant-he/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/state"
 )
 
 // WorkingDirPrefix is used when temporary working directories are needed.
diff --git a/lxd/backup/backup_config.go b/lxd/backup/backup_config.go
index 9ac9d4b75d..cb25b27bd6 100644
--- a/lxd/backup/backup_config.go
+++ b/lxd/backup/backup_config.go
@@ -8,9 +8,9 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Config represents the config of a backup that can be stored in a backup.yaml file (or embedded in index.yaml).
diff --git a/lxd/backup/backup_info.go b/lxd/backup/backup_info.go
index 98d5f6b268..817f87e52c 100644
--- a/lxd/backup/backup_info.go
+++ b/lxd/backup/backup_info.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Type indicates the type of backup.
diff --git a/lxd/backup/backup_instance.go b/lxd/backup/backup_instance.go
index 09a6d3de52..9dd6c60876 100644
--- a/lxd/backup/backup_instance.go
+++ b/lxd/backup/backup_instance.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Instance represents the backup relevant subset of a LXD instance.
diff --git a/lxd/backup/backup_utils.go b/lxd/backup/backup_utils.go
index fc8ca75d15..08dc35918c 100644
--- a/lxd/backup/backup_utils.go
+++ b/lxd/backup/backup_utils.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // TarReader rewinds backup file handle r and returns new tar reader and process cleanup function.
diff --git a/lxd/backup/backup_volume.go b/lxd/backup/backup_volume.go
index 85f533d2cb..2705e61e56 100644
--- a/lxd/backup/backup_volume.go
+++ b/lxd/backup/backup_volume.go
@@ -5,11 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // VolumeBackup represents a custom volume backup.
diff --git a/lxd/certificates.go b/lxd/certificates.go
index b1cd3a8711..673ae5a386 100644
--- a/lxd/certificates.go
+++ b/lxd/certificates.go
@@ -12,17 +12,17 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
-
-	log "github.com/grant-he/lxd/shared/log15"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
+
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 var certificatesCmd = APIEndpoint{
diff --git a/lxd/cgroup/abstraction.go b/lxd/cgroup/abstraction.go
index 0a9b942435..c57ae2e3bc 100644
--- a/lxd/cgroup/abstraction.go
+++ b/lxd/cgroup/abstraction.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // CGroup represents the main cgroup abstraction.
diff --git a/lxd/cgroup/file.go b/lxd/cgroup/file.go
index 410d4c630a..7ad0679624 100644
--- a/lxd/cgroup/file.go
+++ b/lxd/cgroup/file.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // NewFileReadWriter returns a CGroup instance using the filesystem as its backend.
diff --git a/lxd/cgroup/init.go b/lxd/cgroup/init.go
index fb4dd93964..1c8ff688d2 100644
--- a/lxd/cgroup/init.go
+++ b/lxd/cgroup/init.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var cgControllers = map[string]Backend{}
diff --git a/lxd/cluster/config.go b/lxd/cluster/config.go
index cbf91c8773..548911cc30 100644
--- a/lxd/cluster/config.go
+++ b/lxd/cluster/config.go
@@ -13,8 +13,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/scrypt"
 
-	"github.com/grant-he/lxd/lxd/config"
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 // Config holds cluster-wide configuration values.
diff --git a/lxd/cluster/config_test.go b/lxd/cluster/config_test.go
index d5ec7e74cd..4b2ab5e42a 100644
--- a/lxd/cluster/config_test.go
+++ b/lxd/cluster/config_test.go
@@ -3,8 +3,8 @@ package cluster_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/connect.go b/lxd/cluster/connect.go
index 6fd4fbfbd6..3667dfe56d 100644
--- a/lxd/cluster/connect.go
+++ b/lxd/cluster/connect.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // UserAgentNotifier used to distinguish between a regular client request and an internal cluster request when
diff --git a/lxd/cluster/events.go b/lxd/cluster/events.go
index 22b2b23987..2949be8de9 100644
--- a/lxd/cluster/events.go
+++ b/lxd/cluster/events.go
@@ -5,13 +5,13 @@ import (
 	"sync"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/endpoints"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/endpoints"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var listeners = map[string]*lxd.EventListener{}
diff --git a/lxd/cluster/gateway.go b/lxd/cluster/gateway.go
index 1879bffab4..b57db673c5 100644
--- a/lxd/cluster/gateway.go
+++ b/lxd/cluster/gateway.go
@@ -21,10 +21,10 @@ import (
 
 	dqlite "github.com/canonical/go-dqlite"
 	client "github.com/canonical/go-dqlite/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/gateway_export_test.go b/lxd/cluster/gateway_export_test.go
index 3daa1dee5b..2ee96d5bc1 100644
--- a/lxd/cluster/gateway_export_test.go
+++ b/lxd/cluster/gateway_export_test.go
@@ -1,8 +1,8 @@
 package cluster
 
 import (
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
 )
 
 // IsLeader returns true if this node is the leader.
diff --git a/lxd/cluster/gateway_test.go b/lxd/cluster/gateway_test.go
index 43d6f434cf..ce782928af 100644
--- a/lxd/cluster/gateway_test.go
+++ b/lxd/cluster/gateway_test.go
@@ -12,10 +12,10 @@ import (
 	"testing"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/heartbeat.go b/lxd/cluster/heartbeat.go
index dfe3c517f3..41ad468712 100644
--- a/lxd/cluster/heartbeat.go
+++ b/lxd/cluster/heartbeat.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/heartbeat_test.go b/lxd/cluster/heartbeat_test.go
index 7e9bb58dde..e322f69fb0 100644
--- a/lxd/cluster/heartbeat_test.go
+++ b/lxd/cluster/heartbeat_test.go
@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/info.go b/lxd/cluster/info.go
index e16dd30648..ee226691ab 100644
--- a/lxd/cluster/info.go
+++ b/lxd/cluster/info.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index 44ec8922a4..c0618b7244 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -9,17 +9,17 @@ import (
 
 	"github.com/canonical/go-dqlite/app"
 	"github.com/canonical/go-dqlite/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go
index f8af188e0f..1a66266ffe 100644
--- a/lxd/cluster/membership_test.go
+++ b/lxd/cluster/membership_test.go
@@ -13,13 +13,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 )
 
 func TestBootstrap_UnmetPreconditions(t *testing.T) {
diff --git a/lxd/cluster/migrate.go b/lxd/cluster/migrate.go
index 0f70c79c6e..91d3d2ad83 100644
--- a/lxd/cluster/migrate.go
+++ b/lxd/cluster/migrate.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/go-msgpack/codec"
-	"github.com/grant-he/lxd/lxd/cluster/raft"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/cluster/raft"
+	"github.com/lxc/lxd/shared"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 )
diff --git a/lxd/cluster/migrate_test.go b/lxd/cluster/migrate_test.go
index 0e1319a2aa..4f1bd88d2f 100644
--- a/lxd/cluster/migrate_test.go
+++ b/lxd/cluster/migrate_test.go
@@ -9,8 +9,8 @@ import (
 
 	dqlite "github.com/canonical/go-dqlite"
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/notify.go b/lxd/cluster/notify.go
index f00ad9daed..28f5b44dff 100644
--- a/lxd/cluster/notify.go
+++ b/lxd/cluster/notify.go
@@ -6,12 +6,12 @@ import (
 	"sync"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/notify_test.go b/lxd/cluster/notify_test.go
index d038175d42..4e19477d56 100644
--- a/lxd/cluster/notify_test.go
+++ b/lxd/cluster/notify_test.go
@@ -7,14 +7,14 @@ import (
 	"testing"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/cluster/raft_test.go b/lxd/cluster/raft_test.go
index 3f34cf6c95..8bc9ee9fcf 100644
--- a/lxd/cluster/raft_test.go
+++ b/lxd/cluster/raft_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/canonical/go-dqlite/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/lxd/cluster/recover.go b/lxd/cluster/recover.go
index 841dfc6583..d14f390622 100644
--- a/lxd/cluster/recover.go
+++ b/lxd/cluster/recover.go
@@ -8,8 +8,8 @@ import (
 
 	dqlite "github.com/canonical/go-dqlite"
 	client "github.com/canonical/go-dqlite/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/resolve.go b/lxd/cluster/resolve.go
index 9200a8ccee..084fa9db24 100644
--- a/lxd/cluster/resolve.go
+++ b/lxd/cluster/resolve.go
@@ -3,7 +3,7 @@ package cluster
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 // ResolveTarget is a convenience for handling the value ?targetNode query
diff --git a/lxd/cluster/tls.go b/lxd/cluster/tls.go
index dc2664877f..5a409a9d41 100644
--- a/lxd/cluster/tls.go
+++ b/lxd/cluster/tls.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 // Return a TLS configuration suitable for establishing inter-node network
diff --git a/lxd/cluster/upgrade.go b/lxd/cluster/upgrade.go
index fff8e1b830..860fbda234 100644
--- a/lxd/cluster/upgrade.go
+++ b/lxd/cluster/upgrade.go
@@ -8,12 +8,12 @@ import (
 	"os"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/cluster/upgrade_test.go b/lxd/cluster/upgrade_test.go
index d1c4c44893..72f2c538b4 100644
--- a/lxd/cluster/upgrade_test.go
+++ b/lxd/cluster/upgrade_test.go
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/config/map.go b/lxd/config/map.go
index f78a772a5f..dce73165e0 100644
--- a/lxd/config/map.go
+++ b/lxd/config/map.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Map is a structured map of config keys to config values.
diff --git a/lxd/config/map_test.go b/lxd/config/map_test.go
index 670e5a2d4b..0c4934d70e 100644
--- a/lxd/config/map_test.go
+++ b/lxd/config/map_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/config"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/config/safe.go b/lxd/config/safe.go
index a716ec0325..92da5a9007 100644
--- a/lxd/config/safe.go
+++ b/lxd/config/safe.go
@@ -3,9 +3,9 @@ package config
 import (
 	"fmt"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // SafeLoad is a wrapper around Load() that does not error when invalid keys
diff --git a/lxd/config/safe_test.go b/lxd/config/safe_test.go
index 158e763d17..92c79c6d67 100644
--- a/lxd/config/safe_test.go
+++ b/lxd/config/safe_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/config"
 )
 
 // If the givne values contain invalid keys, they are ignored.
diff --git a/lxd/config/schema.go b/lxd/config/schema.go
index 5aba8910d7..a1bbc3edad 100644
--- a/lxd/config/schema.go
+++ b/lxd/config/schema.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Schema defines the available keys of a config Map, along with the types
diff --git a/lxd/config/schema_test.go b/lxd/config/schema_test.go
index c73faef617..b9a62760c4 100644
--- a/lxd/config/schema_test.go
+++ b/lxd/config/schema_test.go
@@ -3,7 +3,7 @@ package config_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/config/validators_test.go b/lxd/config/validators_test.go
index 91f02be319..44d6f3e072 100644
--- a/lxd/config/validators_test.go
+++ b/lxd/config/validators_test.go
@@ -3,7 +3,7 @@ package config_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/daemon.go b/lxd/daemon.go
index 261208152c..8e8cd12c20 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -30,35 +30,35 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery/identchecker"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/device"
-	"github.com/grant-he/lxd/lxd/endpoints"
-	"github.com/grant-he/lxd/lxd/events"
-	"github.com/grant-he/lxd/lxd/firewall"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/ucred"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/device"
+	"github.com/lxc/lxd/lxd/endpoints"
+	"github.com/lxc/lxd/lxd/events"
+	"github.com/lxc/lxd/lxd/firewall"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/ucred"
 
 	// Import instance/drivers without name so init() runs.
-	_ "github.com/grant-he/lxd/lxd/instance/drivers"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/maas"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/rbac"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/seccomp"
-	"github.com/grant-he/lxd/lxd/state"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
-
-	log "github.com/grant-he/lxd/shared/log15"
+	_ "github.com/lxc/lxd/lxd/instance/drivers"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/maas"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/rbac"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/seccomp"
+	"github.com/lxc/lxd/lxd/state"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
+
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // A Daemon can respond to requests from a shared client.
diff --git a/lxd/daemon_config.go b/lxd/daemon_config.go
index 90d3e1c9f2..57b6f04533 100644
--- a/lxd/daemon_config.go
+++ b/lxd/daemon_config.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
 )
 
 func daemonConfigRender(state *state.State) (map[string]interface{}, error) {
diff --git a/lxd/daemon_images.go b/lxd/daemon_images.go
index 4c28e5ed5c..3a5b244d7e 100644
--- a/lxd/daemon_images.go
+++ b/lxd/daemon_images.go
@@ -12,20 +12,20 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/version"
-
-	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/version"
+
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 var imagesDownloading = map[string]chan bool{}
diff --git a/lxd/daemon_integration_test.go b/lxd/daemon_integration_test.go
index daebc73de7..2db5d9665f 100644
--- a/lxd/daemon_integration_test.go
+++ b/lxd/daemon_integration_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logging"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/daemon_storage.go b/lxd/daemon_storage.go
index fc9f3769a7..c1d85688b7 100644
--- a/lxd/daemon_storage.go
+++ b/lxd/daemon_storage.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
 )
 
 func daemonStorageMount(s *state.State) error {
diff --git a/lxd/db/backups.go b/lxd/db/backups.go
index efe57ad745..f54fe8bb2d 100644
--- a/lxd/db/backups.go
+++ b/lxd/db/backups.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // InstanceBackup is a value object holding all db-related details about an instance backup.
diff --git a/lxd/db/certificates.mapper.go b/lxd/db/certificates.mapper.go
index c4d554ea19..c682094754 100644
--- a/lxd/db/certificates.mapper.go
+++ b/lxd/db/certificates.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/certificates_test.go b/lxd/db/certificates_test.go
index a5ca32281e..ebff1e66a5 100644
--- a/lxd/db/certificates_test.go
+++ b/lxd/db/certificates_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 func TestGetCertificate(t *testing.T) {
diff --git a/lxd/db/cluster/constants.go b/lxd/db/cluster/constants.go
index 68ce7c630b..fbb616948c 100644
--- a/lxd/db/cluster/constants.go
+++ b/lxd/db/cluster/constants.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Numeric type codes identifying different kind of entities.
diff --git a/lxd/db/cluster/open.go b/lxd/db/cluster/open.go
index 53dcc11a7e..d888e15dfe 100644
--- a/lxd/db/cluster/open.go
+++ b/lxd/db/cluster/open.go
@@ -7,13 +7,13 @@ import (
 	"sync/atomic"
 
 	driver "github.com/canonical/go-dqlite/driver"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/db/schema"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/cluster/open_test.go b/lxd/db/cluster/open_test.go
index 827b7979ec..19c0b98ae5 100644
--- a/lxd/db/cluster/open_test.go
+++ b/lxd/db/cluster/open_test.go
@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/cluster/query.go b/lxd/db/cluster/query.go
index 47216a052c..16b7aedf99 100644
--- a/lxd/db/cluster/query.go
+++ b/lxd/db/cluster/query.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 )
 
 // Update the schema and api_extensions columns of the row in the nodes table
diff --git a/lxd/db/cluster/update.go b/lxd/db/cluster/update.go
index ab741b4593..750097c693 100644
--- a/lxd/db/cluster/update.go
+++ b/lxd/db/cluster/update.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/db/schema"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/cluster/update_test.go b/lxd/db/cluster/update_test.go
index d0a0f8bcab..a9f288b101 100644
--- a/lxd/db/cluster/update_test.go
+++ b/lxd/db/cluster/update_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/osarch"
 	"github.com/mattn/go-sqlite3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/config.go b/lxd/db/config.go
index 22eb513af9..b39e5ca0ae 100644
--- a/lxd/db/config.go
+++ b/lxd/db/config.go
@@ -2,7 +2,7 @@
 
 package db
 
-import "github.com/grant-he/lxd/lxd/db/query"
+import "github.com/lxc/lxd/lxd/db/query"
 
 // Config fetches all LXD node-level config keys.
 func (n *NodeTx) Config() (map[string]string, error) {
diff --git a/lxd/db/config_test.go b/lxd/db/config_test.go
index 8db5e636b7..14ea76cf19 100644
--- a/lxd/db/config_test.go
+++ b/lxd/db/config_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/db.go b/lxd/db/db.go
index 7f85a3bad2..232c0d531f 100644
--- a/lxd/db/db.go
+++ b/lxd/db/db.go
@@ -13,11 +13,11 @@ import (
 	"github.com/canonical/go-dqlite/driver"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/node"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/node"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Node mediates access to LXD's data stored in the node-local SQLite database.
diff --git a/lxd/db/db_internal_test.go b/lxd/db/db_internal_test.go
index 57ea437e91..064d7e476b 100644
--- a/lxd/db/db_internal_test.go
+++ b/lxd/db/db_internal_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 const fixtures string = `
diff --git a/lxd/db/db_test.go b/lxd/db/db_test.go
index 42377ba9bc..61c3e0af55 100644
--- a/lxd/db/db_test.go
+++ b/lxd/db/db_test.go
@@ -5,8 +5,8 @@ package db_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/images.go b/lxd/db/images.go
index bf69754453..96346a26ae 100644
--- a/lxd/db/images.go
+++ b/lxd/db/images.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 // Code generation directives.
diff --git a/lxd/db/images.mapper.go b/lxd/db/images.mapper.go
index 4b540af7a5..d656884b1e 100644
--- a/lxd/db/images.mapper.go
+++ b/lxd/db/images.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/images_test.go b/lxd/db/images_test.go
index 53038aaf98..f7866fcaf5 100644
--- a/lxd/db/images_test.go
+++ b/lxd/db/images_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/instances.go b/lxd/db/instances.go
index 9559bbb107..f4f46107cf 100644
--- a/lxd/db/instances.go
+++ b/lxd/db/instances.go
@@ -9,12 +9,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db/query"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/instances.mapper.go b/lxd/db/instances.mapper.go
index eef6d081c2..6beb76d263 100644
--- a/lxd/db/instances.mapper.go
+++ b/lxd/db/instances.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/instances_test.go b/lxd/db/instances_test.go
index d0a2ccc7d8..d6b71eb974 100644
--- a/lxd/db/instances_test.go
+++ b/lxd/db/instances_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func TestContainerList(t *testing.T) {
diff --git a/lxd/db/legacy.go b/lxd/db/legacy.go
index 68dbbdac54..d01b3ea9ac 100644
--- a/lxd/db/legacy.go
+++ b/lxd/db/legacy.go
@@ -5,7 +5,7 @@ package db
 import (
 	"database/sql"
 
-	"github.com/grant-he/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/lxd/db/schema"
 )
 
 // LegacyPatch is a "database" update that performs non-database work. They
diff --git a/lxd/db/migration.go b/lxd/db/migration.go
index 871e187721..32aede1ad7 100644
--- a/lxd/db/migration.go
+++ b/lxd/db/migration.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go
index 8399525311..fb2c07d16c 100644
--- a/lxd/db/migration_test.go
+++ b/lxd/db/migration_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/project"
 )
 
 func TestLoadPreClusteringData(t *testing.T) {
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index b005c6ea9b..b2549cabd5 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // GetNetworksLocalConfig returns a map associating each network name to its
diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go
index b14aabd0dd..8d021afd84 100644
--- a/lxd/db/networks_test.go
+++ b/lxd/db/networks_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/project"
 )
 
 // The GetNetworksLocalConfigs method returns only node-specific config values.
diff --git a/lxd/db/node.go b/lxd/db/node.go
index 630a7cd3fb..3afa6a073c 100644
--- a/lxd/db/node.go
+++ b/lxd/db/node.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // ClusterRole represents the role of a member in a cluster.
diff --git a/lxd/db/node/open.go b/lxd/db/node/open.go
index 513ab13f81..b49bed1961 100644
--- a/lxd/db/node/open.go
+++ b/lxd/db/node/open.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/grant-he/lxd/lxd/db/schema"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Open the node-local database object.
diff --git a/lxd/db/node/open_test.go b/lxd/db/node/open_test.go
index 6f90e7e802..1610404428 100644
--- a/lxd/db/node/open_test.go
+++ b/lxd/db/node/open_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/node"
+	"github.com/lxc/lxd/lxd/db/node"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/node/update.go b/lxd/db/node/update.go
index 15a01c45b4..4a1c35a9d4 100644
--- a/lxd/db/node/update.go
+++ b/lxd/db/node/update.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/db/schema"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Schema for the local database.
diff --git a/lxd/db/node/update_test.go b/lxd/db/node/update_test.go
index 251c91718d..6f204fb291 100644
--- a/lxd/db/node/update_test.go
+++ b/lxd/db/node/update_test.go
@@ -4,9 +4,9 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/node"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db/node"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/node_test.go b/lxd/db/node_test.go
index 0fc580168d..5a0dd559d7 100644
--- a/lxd/db/node_test.go
+++ b/lxd/db/node_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/operations.go b/lxd/db/operations.go
index 2c0a574359..203c1d5b9c 100644
--- a/lxd/db/operations.go
+++ b/lxd/db/operations.go
@@ -5,7 +5,7 @@ package db
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/operations_test.go b/lxd/db/operations_test.go
index fa1e769b84..ecbdbf5c4b 100644
--- a/lxd/db/operations_test.go
+++ b/lxd/db/operations_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/patches.go b/lxd/db/patches.go
index 4edee732f2..cd5ddb1e60 100644
--- a/lxd/db/patches.go
+++ b/lxd/db/patches.go
@@ -5,7 +5,7 @@ package db
 import (
 	"database/sql"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 )
 
 // GetAppliedPatches returns the names of all patches currently applied on this node.
diff --git a/lxd/db/profiles.go b/lxd/db/profiles.go
index 3c7b3ce58f..f04eeabe26 100644
--- a/lxd/db/profiles.go
+++ b/lxd/db/profiles.go
@@ -5,8 +5,8 @@ package db
 import (
 	"fmt"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/shared/api"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/profiles.mapper.go b/lxd/db/profiles.mapper.go
index d01b2d32f0..6df1fdcd66 100644
--- a/lxd/db/profiles.mapper.go
+++ b/lxd/db/profiles.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/projects.go b/lxd/db/projects.go
index 55df769fe5..ff613611d1 100644
--- a/lxd/db/projects.go
+++ b/lxd/db/projects.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Code generation directives.
diff --git a/lxd/db/projects.mapper.go b/lxd/db/projects.mapper.go
index dc20489d30..6c8565127b 100644
--- a/lxd/db/projects.mapper.go
+++ b/lxd/db/projects.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/projects_test.go b/lxd/db/projects_test.go
index 67fcbeea3a..7393d9fb5f 100644
--- a/lxd/db/projects_test.go
+++ b/lxd/db/projects_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/query/config_test.go b/lxd/db/query/config_test.go
index 97c57e0d29..d77026d172 100644
--- a/lxd/db/query/config_test.go
+++ b/lxd/db/query/config_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/query/count_test.go b/lxd/db/query/count_test.go
index 71136f4e75..3e69c58eb0 100644
--- a/lxd/db/query/count_test.go
+++ b/lxd/db/query/count_test.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/query/dump_test.go b/lxd/db/query/dump_test.go
index 2608f526ca..3f6c4a676a 100644
--- a/lxd/db/query/dump_test.go
+++ b/lxd/db/query/dump_test.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/query/objects_test.go b/lxd/db/query/objects_test.go
index db8e250994..1551261fd1 100644
--- a/lxd/db/query/objects_test.go
+++ b/lxd/db/query/objects_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/db/query/retry.go b/lxd/db/query/retry.go
index fcc07dc581..dd44e47e26 100644
--- a/lxd/db/query/retry.go
+++ b/lxd/db/query/retry.go
@@ -10,7 +10,7 @@ import (
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 const maxRetries = 250
diff --git a/lxd/db/query/slices_test.go b/lxd/db/query/slices_test.go
index a6e6adf1c6..471747d4c0 100644
--- a/lxd/db/query/slices_test.go
+++ b/lxd/db/query/slices_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/subtest"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/subtest"
 )
 
 func TestSelectURIs(t *testing.T) {
diff --git a/lxd/db/query/transaction.go b/lxd/db/query/transaction.go
index c205e943ab..901177b0e8 100644
--- a/lxd/db/query/transaction.go
+++ b/lxd/db/query/transaction.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/query/transaction_test.go b/lxd/db/query/transaction_test.go
index a391211ef8..8b73b15d13 100644
--- a/lxd/db/query/transaction_test.go
+++ b/lxd/db/query/transaction_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/db/raft.go b/lxd/db/raft.go
index 163dd79f21..4444471299 100644
--- a/lxd/db/raft.go
+++ b/lxd/db/raft.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/canonical/go-dqlite/client"
-	"github.com/grant-he/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/raft_test.go b/lxd/db/raft_test.go
index d0793b9de9..be881f167a 100644
--- a/lxd/db/raft_test.go
+++ b/lxd/db/raft_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/schema/query.go b/lxd/db/schema/query.go
index 9d5fdb222c..f0e1eed8f0 100644
--- a/lxd/db/schema/query.go
+++ b/lxd/db/schema/query.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/schema/schema.go b/lxd/db/schema/schema.go
index e5bcfee2bc..8d8435ef11 100644
--- a/lxd/db/schema/schema.go
+++ b/lxd/db/schema/schema.go
@@ -6,8 +6,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/schema/schema_test.go b/lxd/db/schema/schema_test.go
index 6e97025e1f..2854642827 100644
--- a/lxd/db/schema/schema_test.go
+++ b/lxd/db/schema/schema_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/db/schema"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/shared"
 )
 
 // Create a new Schema by specifying an explicit map from versions to Update
diff --git a/lxd/db/schema/update_test.go b/lxd/db/schema/update_test.go
index 215d4a7ce4..8e3449a023 100644
--- a/lxd/db/schema/update_test.go
+++ b/lxd/db/schema/update_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db/schema"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db/schema"
+	"github.com/lxc/lxd/shared"
 )
 
 // A Go source file matching the given prefix is created in the calling
diff --git a/lxd/db/snapshots.go b/lxd/db/snapshots.go
index 972d6ba0e3..4683eab328 100644
--- a/lxd/db/snapshots.go
+++ b/lxd/db/snapshots.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Code generation directives.
diff --git a/lxd/db/snapshots.mapper.go b/lxd/db/snapshots.mapper.go
index 931f6d6e50..e4300b2b8c 100644
--- a/lxd/db/snapshots.mapper.go
+++ b/lxd/db/snapshots.mapper.go
@@ -7,9 +7,9 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/snapshots_test.go b/lxd/db/snapshots_test.go
index 560186ab78..d9d2f445ae 100644
--- a/lxd/db/snapshots_test.go
+++ b/lxd/db/snapshots_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func TestGetInstanceSnapshots(t *testing.T) {
diff --git a/lxd/db/storage_pools.go b/lxd/db/storage_pools.go
index 6882ee4c4b..76d12693d1 100644
--- a/lxd/db/storage_pools.go
+++ b/lxd/db/storage_pools.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // StorageRemoteDriverNames returns a list of remote storage driver names.
diff --git a/lxd/db/storage_pools_export_test.go b/lxd/db/storage_pools_export_test.go
index 020ce07f2f..1225bc0c71 100644
--- a/lxd/db/storage_pools_export_test.go
+++ b/lxd/db/storage_pools_export_test.go
@@ -2,7 +2,7 @@
 
 package db
 
-import "github.com/grant-he/lxd/shared/api"
+import "github.com/lxc/lxd/shared/api"
 
 func (c *Cluster) GetStoragePoolVolume(project string, volumeName string, volumeType int, poolID, nodeID int64) (int64, *api.StorageVolume, error) {
 	return c.storagePoolVolumeGetType(project, volumeName, volumeType, poolID, nodeID)
diff --git a/lxd/db/storage_pools_test.go b/lxd/db/storage_pools_test.go
index 2135bbea01..9830798068 100644
--- a/lxd/db/storage_pools_test.go
+++ b/lxd/db/storage_pools_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/db/storage_volume_snapshots.go b/lxd/db/storage_volume_snapshots.go
index 95d4b3f0e1..e0755d8d33 100644
--- a/lxd/db/storage_volume_snapshots.go
+++ b/lxd/db/storage_volume_snapshots.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // CreateStorageVolumeSnapshot creates a new storage volume snapshot attached to a given
diff --git a/lxd/db/storage_volumes.go b/lxd/db/storage_volumes.go
index 6711a69d01..261784ce1f 100644
--- a/lxd/db/storage_volumes.go
+++ b/lxd/db/storage_volumes.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/db/storage_volumes_test.go b/lxd/db/storage_volumes_test.go
index f5aba6e02b..557a23b449 100644
--- a/lxd/db/storage_volumes_test.go
+++ b/lxd/db/storage_volumes_test.go
@@ -5,7 +5,7 @@ package db_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/device/device_common.go b/lxd/device/device_common.go
index 45466edc35..4de9509d01 100644
--- a/lxd/device/device_common.go
+++ b/lxd/device/device_common.go
@@ -3,12 +3,12 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 // deviceCommon represents the common struct for all devices.
diff --git a/lxd/device/device_interface.go b/lxd/device/device_interface.go
index 8f361c6cab..9046163bbd 100644
--- a/lxd/device/device_interface.go
+++ b/lxd/device/device_interface.go
@@ -1,10 +1,10 @@
 package device
 
 import (
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared/api"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // VolatileSetter is a function that accepts one or more key/value strings to save into the LXD
diff --git a/lxd/device/device_load.go b/lxd/device/device_load.go
index 6e6dff7947..cf4b521a59 100644
--- a/lxd/device/device_load.go
+++ b/lxd/device/device_load.go
@@ -3,10 +3,10 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
 )
 
 // load instantiates a device and initialises its internal state. It does not validate the config supplied.
diff --git a/lxd/device/device_utils_disk.go b/lxd/device/device_utils_disk.go
index 3752b107d9..217be7e157 100644
--- a/lxd/device/device_utils_disk.go
+++ b/lxd/device/device_utils_disk.go
@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // BlockFsDetect detects the type of block device.
diff --git a/lxd/device/device_utils_generic.go b/lxd/device/device_utils_generic.go
index bb8b8faf20..819353e0b6 100644
--- a/lxd/device/device_utils_generic.go
+++ b/lxd/device/device_utils_generic.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
 )
 
 // deviceJoinPath joins together prefix and text delimited by a "." for device path generation.
diff --git a/lxd/device/device_utils_infiniband.go b/lxd/device/device_utils_infiniband.go
index b152aa2ee9..77a3aba2d9 100644
--- a/lxd/device/device_utils_infiniband.go
+++ b/lxd/device/device_utils_infiniband.go
@@ -5,9 +5,9 @@ import (
 	"net"
 	"strings"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared/api"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // IBDevPrefix Infiniband devices prefix.
diff --git a/lxd/device/device_utils_inotify.go b/lxd/device/device_utils_inotify.go
index d1675ac5ff..30a3ba6501 100644
--- a/lxd/device/device_utils_inotify.go
+++ b/lxd/device/device_utils_inotify.go
@@ -8,11 +8,11 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 const inotifyBatchInEvents uint = 100
diff --git a/lxd/device/device_utils_instance.go b/lxd/device/device_utils_instance.go
index 5fb6482335..c0793f06a6 100644
--- a/lxd/device/device_utils_instance.go
+++ b/lxd/device/device_utils_instance.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"sync"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/state"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/state"
 )
 
 // reservedDevicesMutex used to coordinate access for checking reserved devices.
diff --git a/lxd/device/device_utils_network.go b/lxd/device/device_utils_network.go
index d35712e6e6..74483dbce1 100644
--- a/lxd/device/device_utils_network.go
+++ b/lxd/device/device_utils_network.go
@@ -10,18 +10,18 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // Instances can be started in parallel, so lock the creation of VLANs.
diff --git a/lxd/device/device_utils_proxy.go b/lxd/device/device_utils_proxy.go
index bb382a8919..29d53eeb7a 100644
--- a/lxd/device/device_utils_proxy.go
+++ b/lxd/device/device_utils_proxy.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // ProxyParseAddr validates a proxy address and parses it into its constituent parts.
diff --git a/lxd/device/device_utils_unix.go b/lxd/device/device_utils_unix.go
index 957b6331b6..dcde09495c 100644
--- a/lxd/device/device_utils_unix.go
+++ b/lxd/device/device_utils_unix.go
@@ -10,12 +10,12 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/state"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/state"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // unixDefaultMode default mode to create unix devices with if not specified in device config.
diff --git a/lxd/device/device_utils_unix_events.go b/lxd/device/device_utils_unix_events.go
index f115028772..a85095f7b6 100644
--- a/lxd/device/device_utils_unix_events.go
+++ b/lxd/device/device_utils_unix_events.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"sync"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // UnixEvent represents the properties of a Unix device inotify event.
diff --git a/lxd/device/device_utils_unix_hotplug_events.go b/lxd/device/device_utils_unix_hotplug_events.go
index 534e42f273..aa7ef17697 100644
--- a/lxd/device/device_utils_unix_hotplug_events.go
+++ b/lxd/device/device_utils_unix_hotplug_events.go
@@ -6,11 +6,11 @@ import (
 	"strings"
 	"sync"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // UnixHotplugEvent represents the properties of a Unix hotplug device uevent.
diff --git a/lxd/device/device_utils_usb_events.go b/lxd/device/device_utils_usb_events.go
index 3e01e2645f..18840eafb2 100644
--- a/lxd/device/device_utils_usb_events.go
+++ b/lxd/device/device_utils_usb_events.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"sync"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // USBEvent represents the properties of a USB device uevent.
diff --git a/lxd/device/disk.go b/lxd/device/disk.go
index 63e19d5f60..546bb945b3 100644
--- a/lxd/device/disk.go
+++ b/lxd/device/disk.go
@@ -14,23 +14,23 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/subprocess"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/subprocess"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // Special disk "source" value used for generating a VM cloud-init config ISO.
diff --git a/lxd/device/gpu.go b/lxd/device/gpu.go
index b387465191..9c7724077b 100644
--- a/lxd/device/gpu.go
+++ b/lxd/device/gpu.go
@@ -12,12 +12,12 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/resources"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/resources"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 const gpuDRIDevPath = "/dev/dri"
diff --git a/lxd/device/infiniband_physical.go b/lxd/device/infiniband_physical.go
index e31f668292..fc1046262a 100644
--- a/lxd/device/infiniband_physical.go
+++ b/lxd/device/infiniband_physical.go
@@ -3,12 +3,12 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/resources"
-	"github.com/grant-he/lxd/shared"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/resources"
+	"github.com/lxc/lxd/shared"
 )
 
 type infinibandPhysical struct {
diff --git a/lxd/device/infiniband_sriov.go b/lxd/device/infiniband_sriov.go
index 100e52d585..953bbcbb54 100644
--- a/lxd/device/infiniband_sriov.go
+++ b/lxd/device/infiniband_sriov.go
@@ -3,13 +3,13 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/resources"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/resources"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type infinibandSRIOV struct {
diff --git a/lxd/device/nic.go b/lxd/device/nic.go
index 3c65a2a7b0..3aa3d164c2 100644
--- a/lxd/device/nic.go
+++ b/lxd/device/nic.go
@@ -1,7 +1,7 @@
 package device
 
 import (
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // nicValidationRules returns config validation rules for nic devices.
diff --git a/lxd/device/nic_bridged.go b/lxd/device/nic_bridged.go
index 9dd28cc8ba..f4b6144adf 100644
--- a/lxd/device/nic_bridged.go
+++ b/lxd/device/nic_bridged.go
@@ -16,23 +16,23 @@ import (
 	"github.com/mdlayher/netx/eui64"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/dnsmasq"
-	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
-	firewallDrivers "github.com/grant-he/lxd/lxd/firewall/drivers"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/network/openvswitch"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/dnsmasq"
+	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
+	firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/network/openvswitch"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 type nicBridged struct {
diff --git a/lxd/device/nic_ipvlan.go b/lxd/device/nic_ipvlan.go
index 5728be602f..86582085a1 100644
--- a/lxd/device/nic_ipvlan.go
+++ b/lxd/device/nic_ipvlan.go
@@ -5,13 +5,13 @@ import (
 	"net"
 	"strings"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 const ipvlanModeL3S = "l3s"
diff --git a/lxd/device/nic_macvlan.go b/lxd/device/nic_macvlan.go
index 449baff5be..d40f3f6629 100644
--- a/lxd/device/nic_macvlan.go
+++ b/lxd/device/nic_macvlan.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type nicMACVLAN struct {
diff --git a/lxd/device/nic_ovn.go b/lxd/device/nic_ovn.go
index 4258d0d9a3..48bc65fd4d 100644
--- a/lxd/device/nic_ovn.go
+++ b/lxd/device/nic_ovn.go
@@ -9,19 +9,19 @@ import (
 	"github.com/mdlayher/netx/eui64"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/network/openvswitch"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/lxc/lxd/lxd/cluster"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/network/openvswitch"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // ovnNet defines an interface for accessing instance specific functions on OVN network.
diff --git a/lxd/device/nic_p2p.go b/lxd/device/nic_p2p.go
index c2a1ba9037..69a57ef7d9 100644
--- a/lxd/device/nic_p2p.go
+++ b/lxd/device/nic_p2p.go
@@ -3,12 +3,12 @@ package device
 import (
 	"fmt"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
 )
 
 type nicP2P struct {
diff --git a/lxd/device/nic_physical.go b/lxd/device/nic_physical.go
index 8f8042b8f1..7d7400bbbc 100644
--- a/lxd/device/nic_physical.go
+++ b/lxd/device/nic_physical.go
@@ -5,13 +5,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 type nicPhysical struct {
diff --git a/lxd/device/nic_routed.go b/lxd/device/nic_routed.go
index 58db2ca81c..ca056a4dac 100644
--- a/lxd/device/nic_routed.go
+++ b/lxd/device/nic_routed.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 const nicRoutedIPv4GW = "169.254.0.1"
diff --git a/lxd/device/nic_sriov.go b/lxd/device/nic_sriov.go
index a8f2c001d4..70d0cabc0f 100644
--- a/lxd/device/nic_sriov.go
+++ b/lxd/device/nic_sriov.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type nicSRIOV struct {
diff --git a/lxd/device/nictype/nictype.go b/lxd/device/nictype/nictype.go
index bd6a28a812..5c8ef08209 100644
--- a/lxd/device/nictype/nictype.go
+++ b/lxd/device/nictype/nictype.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
 )
 
 // NICType resolves the NIC Type for the supplied NIC device config.
diff --git a/lxd/device/none.go b/lxd/device/none.go
index ee714ba4e7..dcd2a70dba 100644
--- a/lxd/device/none.go
+++ b/lxd/device/none.go
@@ -1,8 +1,8 @@
 package device
 
 import (
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
 )
 
 type none struct {
diff --git a/lxd/device/proxy.go b/lxd/device/proxy.go
index 93e0913977..d169a4671e 100644
--- a/lxd/device/proxy.go
+++ b/lxd/device/proxy.go
@@ -13,17 +13,17 @@ import (
 	"github.com/pkg/errors"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/grant-he/lxd/lxd/apparmor"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/subprocess"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/apparmor"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/subprocess"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 type proxy struct {
diff --git a/lxd/device/tpm.go b/lxd/device/tpm.go
index 254a637c1d..47d7c9b73f 100644
--- a/lxd/device/tpm.go
+++ b/lxd/device/tpm.go
@@ -11,14 +11,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/subprocess"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/subprocess"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 type tpm struct {
diff --git a/lxd/device/unix_common.go b/lxd/device/unix_common.go
index fe4c640e2c..156e5d2600 100644
--- a/lxd/device/unix_common.go
+++ b/lxd/device/unix_common.go
@@ -5,12 +5,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // unixIsOurDeviceType checks that device file type matches what we are expecting in the config.
diff --git a/lxd/device/unix_hotplug.go b/lxd/device/unix_hotplug.go
index 62e8b5532e..6f3f39370a 100644
--- a/lxd/device/unix_hotplug.go
+++ b/lxd/device/unix_hotplug.go
@@ -8,11 +8,11 @@ import (
 
 	udev "github.com/farjump/go-libudev"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // unixHotplugIsOurDevice indicates whether the unixHotplug device event qualifies as part of our device.
diff --git a/lxd/device/usb.go b/lxd/device/usb.go
index d38ad89d82..e668acf278 100644
--- a/lxd/device/usb.go
+++ b/lxd/device/usb.go
@@ -7,12 +7,12 @@ import (
 	"path"
 	"strings"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/validate"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // usbDevPath is the path where USB devices can be enumerated.
diff --git a/lxd/devices.go b/lxd/devices.go
index 98e852fa4b..67d3def366 100644
--- a/lxd/devices.go
+++ b/lxd/devices.go
@@ -12,17 +12,17 @@ import (
 	"golang.org/x/sys/unix"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
-
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/device"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/resources"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	_ "github.com/lxc/lxd/lxd/include"
+
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/device"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/resources"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 /*
diff --git a/lxd/devlxd.go b/lxd/devlxd.go
index 18a79d57d7..7256ab6525 100644
--- a/lxd/devlxd.go
+++ b/lxd/devlxd.go
@@ -17,16 +17,16 @@ import (
 	"github.com/gorilla/mux"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/ucred"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/ucred"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // DevLxdServer creates an http.Server capable of handling requests against the
diff --git a/lxd/devlxd_test.go b/lxd/devlxd_test.go
index 4d8ae45ba1..5902358f8b 100644
--- a/lxd/devlxd_test.go
+++ b/lxd/devlxd_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/lxd/ucred"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/ucred"
 )
 
 var testDir string
diff --git a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go
index ddbfa8cadc..f52a2c1ac5 100644
--- a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go
+++ b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/mdlayher/netx/eui64"
 
-	"github.com/grant-he/lxd/lxd/dnsmasq"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/dnsmasq"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 // ErrDHCPNotSupported indicates network doesn't support DHCP for this IP protocol.
diff --git a/lxd/dnsmasq/dnsmasq.go b/lxd/dnsmasq/dnsmasq.go
index 41d83c9f72..d8491c2572 100644
--- a/lxd/dnsmasq/dnsmasq.go
+++ b/lxd/dnsmasq/dnsmasq.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/subprocess"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/subprocess"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // DHCPAllocation represents an IP allocation from dnsmasq.
diff --git a/lxd/endpoints/cluster.go b/lxd/endpoints/cluster.go
index 3619de6e44..6e977d25e1 100644
--- a/lxd/endpoints/cluster.go
+++ b/lxd/endpoints/cluster.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // ClusterAddress returns the cluster addresss of the cluster endpoint, or an
diff --git a/lxd/endpoints/devlxd_test.go b/lxd/endpoints/devlxd_test.go
index 41d9389cd8..f92c0bbf2c 100644
--- a/lxd/endpoints/devlxd_test.go
+++ b/lxd/endpoints/devlxd_test.go
@@ -3,7 +3,7 @@ package endpoints_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/endpoints.go b/lxd/endpoints/endpoints.go
index 4fdf33ecb2..717649e0e6 100644
--- a/lxd/endpoints/endpoints.go
+++ b/lxd/endpoints/endpoints.go
@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 	tomb "gopkg.in/tomb.v2"
 )
 
diff --git a/lxd/endpoints/endpoints_exported_test.go b/lxd/endpoints/endpoints_exported_test.go
index d6217ca49e..cc4802fee8 100644
--- a/lxd/endpoints/endpoints_exported_test.go
+++ b/lxd/endpoints/endpoints_exported_test.go
@@ -1,8 +1,8 @@
 package endpoints
 
 import (
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 // New creates a new Endpoints instance without bringing it up.
diff --git a/lxd/endpoints/endpoints_test.go b/lxd/endpoints/endpoints_test.go
index 2e8c2ef7ad..a51f003edb 100644
--- a/lxd/endpoints/endpoints_test.go
+++ b/lxd/endpoints/endpoints_test.go
@@ -12,11 +12,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/endpoints"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/endpoints"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/local_test.go b/lxd/endpoints/local_test.go
index d3456b5c80..57b34c19be 100644
--- a/lxd/endpoints/local_test.go
+++ b/lxd/endpoints/local_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/network.go b/lxd/endpoints/network.go
index 4c4092dbfb..6d9f4f1e5c 100644
--- a/lxd/endpoints/network.go
+++ b/lxd/endpoints/network.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/endpoints/network_test.go b/lxd/endpoints/network_test.go
index ad63a5ef4f..f59e7c65b7 100644
--- a/lxd/endpoints/network_test.go
+++ b/lxd/endpoints/network_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/endpoints/pprof.go b/lxd/endpoints/pprof.go
index 9ed92588e7..75bb0513b7 100644
--- a/lxd/endpoints/pprof.go
+++ b/lxd/endpoints/pprof.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared/logger"
 
 	_ "net/http/pprof" // pprof magic
 )
diff --git a/lxd/endpoints/socket.go b/lxd/endpoints/socket.go
index 6b6d9a7307..98a81a2646 100644
--- a/lxd/endpoints/socket.go
+++ b/lxd/endpoints/socket.go
@@ -9,9 +9,9 @@ import (
 	"os/user"
 	"strconv"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Bind to the given unix socket path.
diff --git a/lxd/events.go b/lxd/events.go
index be9a419dc9..80b2378dbd 100644
--- a/lxd/events.go
+++ b/lxd/events.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var eventTypes = []string{"logging", "operation", "lifecycle"}
diff --git a/lxd/events/events.go b/lxd/events/events.go
index f4fb584921..ef713d73d1 100644
--- a/lxd/events/events.go
+++ b/lxd/events/events.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pborman/uuid"
 
 	"github.com/gorilla/websocket"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Server represents an instance of an event server.
diff --git a/lxd/events/logging.go b/lxd/events/logging.go
index b9789ebadd..fed38c4a8a 100644
--- a/lxd/events/logging.go
+++ b/lxd/events/logging.go
@@ -3,9 +3,9 @@ package events
 import (
 	"fmt"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // LoggingServer controls what server to use for messages coming from the logger.
diff --git a/lxd/filter/clause.go b/lxd/filter/clause.go
index c4e76745f4..4b6d0a836b 100644
--- a/lxd/filter/clause.go
+++ b/lxd/filter/clause.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Clause is a single filter clause in a filter string.
diff --git a/lxd/filter/clause_test.go b/lxd/filter/clause_test.go
index 74508f2978..0cfa73f5f9 100644
--- a/lxd/filter/clause_test.go
+++ b/lxd/filter/clause_test.go
@@ -3,7 +3,7 @@ package filter_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/filter"
+	"github.com/lxc/lxd/lxd/filter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/filter/match_test.go b/lxd/filter/match_test.go
index 1f3f37cf8d..cdd719cbe6 100644
--- a/lxd/filter/match_test.go
+++ b/lxd/filter/match_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/filter"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/filter"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/filter/value_test.go b/lxd/filter/value_test.go
index 4669b694f8..9669115560 100644
--- a/lxd/filter/value_test.go
+++ b/lxd/filter/value_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/filter"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/filter"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/firewall/drivers/drivers_nftables.go b/lxd/firewall/drivers/drivers_nftables.go
index 7cbdd09b40..887f9469f9 100644
--- a/lxd/firewall/drivers/drivers_nftables.go
+++ b/lxd/firewall/drivers/drivers_nftables.go
@@ -13,10 +13,10 @@ import (
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/version"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/version"
 )
 
 const nftablesNamespace = "lxd"
diff --git a/lxd/firewall/drivers/drivers_xtables.go b/lxd/firewall/drivers/drivers_xtables.go
index b5518d5a66..68828a27b2 100644
--- a/lxd/firewall/drivers/drivers_xtables.go
+++ b/lxd/firewall/drivers/drivers_xtables.go
@@ -10,11 +10,11 @@ import (
 	"strconv"
 	"strings"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Xtables is an implmentation of LXD firewall using {ip, ip6, eb}tables
diff --git a/lxd/firewall/firewall_interface.go b/lxd/firewall/firewall_interface.go
index 0103663088..103b5fa11e 100644
--- a/lxd/firewall/firewall_interface.go
+++ b/lxd/firewall/firewall_interface.go
@@ -3,7 +3,7 @@ package firewall
 import (
 	"net"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
 )
 
 // Firewall represents an LXD firewall.
diff --git a/lxd/firewall/firewall_load.go b/lxd/firewall/firewall_load.go
index c31264d993..ec332e703d 100644
--- a/lxd/firewall/firewall_load.go
+++ b/lxd/firewall/firewall_load.go
@@ -1,8 +1,8 @@
 package firewall
 
 import (
-	"github.com/grant-he/lxd/lxd/firewall/drivers"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/firewall/drivers"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // New returns an appropriate firewall implementation.
diff --git a/lxd/images.go b/lxd/images.go
index a8c3815d24..4fb55b9087 100644
--- a/lxd/images.go
+++ b/lxd/images.go
@@ -26,28 +26,28 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/filter"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/operations"
-	projectutils "github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/filter"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/operations"
+	projectutils "github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var imagesCmd = APIEndpoint{
diff --git a/lxd/init.go b/lxd/init.go
index 05fa41c414..2311b6c3a6 100644
--- a/lxd/init.go
+++ b/lxd/init.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type initDataNode struct {
diff --git a/lxd/instance.go b/lxd/instance.go
index 9c695dfdbb..b58dbe08af 100644
--- a/lxd/instance.go
+++ b/lxd/instance.go
@@ -15,21 +15,21 @@ import (
 	cron "gopkg.in/robfig/cron.v2"
 
 	"github.com/flosch/pongo2"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 // Helper functions
diff --git a/lxd/instance/drivers/driver_common.go b/lxd/instance/drivers/driver_common.go
index a3eb92ace3..f98bd1db69 100644
--- a/lxd/instance/drivers/driver_common.go
+++ b/lxd/instance/drivers/driver_common.go
@@ -4,12 +4,12 @@ import (
 	"errors"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // common provides structure common to all instance types.
diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go
index 659bc67b6b..2a23d02e7b 100644
--- a/lxd/instance/drivers/driver_lxc.go
+++ b/lxd/instance/drivers/driver_lxc.go
@@ -25,40 +25,40 @@ import (
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/apparmor"
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/device"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/instance/operationlock"
-	"github.com/grant-he/lxd/lxd/maas"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/seccomp"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/template"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/netutils"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/apparmor"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/device"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/instance/operationlock"
+	"github.com/lxc/lxd/lxd/maas"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/seccomp"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/template"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/instancewriter"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/netutils"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Helper functions
diff --git a/lxd/instance/drivers/driver_lxc_cmd.go b/lxd/instance/drivers/driver_lxc_cmd.go
index bb77b41636..7d80898e47 100644
--- a/lxd/instance/drivers/driver_lxc_cmd.go
+++ b/lxd/instance/drivers/driver_lxc_cmd.go
@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // lxcCmd represents a running command for an LXC container.
diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
index 3b85e7fd1f..e243634547 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -26,42 +26,42 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
 
-	lxdClient "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/apparmor"
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/device"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/drivers/qmp"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/instance/operationlock"
-	"github.com/grant-he/lxd/lxd/maas"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/resources"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	pongoTemplate "github.com/grant-he/lxd/lxd/template"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/lxd/vsock"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/subprocess"
-	"github.com/grant-he/lxd/shared/termios"
-	"github.com/grant-he/lxd/shared/units"
+	lxdClient "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/apparmor"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/device"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/drivers/qmp"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/instance/operationlock"
+	"github.com/lxc/lxd/lxd/maas"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/resources"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	pongoTemplate "github.com/lxc/lxd/lxd/template"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/lxd/vsock"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/subprocess"
+	"github.com/lxc/lxd/shared/termios"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // qemuAsyncIO is used to indicate disk should use unsafe cache I/O.
diff --git a/lxd/instance/drivers/driver_qemu_cmd.go b/lxd/instance/drivers/driver_qemu_cmd.go
index 8b1df8f250..edc7e5ed25 100644
--- a/lxd/instance/drivers/driver_qemu_cmd.go
+++ b/lxd/instance/drivers/driver_qemu_cmd.go
@@ -5,9 +5,9 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	lxdClient "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	lxdClient "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Cmd represents a running command for an Qemu VM.
diff --git a/lxd/instance/drivers/load.go b/lxd/instance/drivers/load.go
index d0f9d49abf..f478c75ed4 100644
--- a/lxd/instance/drivers/load.go
+++ b/lxd/instance/drivers/load.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/device"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/device"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func init() {
diff --git a/lxd/instance/drivers/qmp/monitor.go b/lxd/instance/drivers/qmp/monitor.go
index 2e3200c916..9a93911a5a 100644
--- a/lxd/instance/drivers/qmp/monitor.go
+++ b/lxd/instance/drivers/qmp/monitor.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/digitalocean/go-qemu/qmp"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 var monitors = map[string]*Monitor{}
diff --git a/lxd/instance/drivers/test_util.go b/lxd/instance/drivers/test_util.go
index 3969ae73e2..6ea131b995 100644
--- a/lxd/instance/drivers/test_util.go
+++ b/lxd/instance/drivers/test_util.go
@@ -1,8 +1,8 @@
 package drivers
 
 import (
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
 )
 
 // PrepareEqualTest modifies any unexported variables required for reflect.DeepEqual to complete safely.
diff --git a/lxd/instance/filter.go b/lxd/instance/filter.go
index b55e974712..495f6717b5 100644
--- a/lxd/instance/filter.go
+++ b/lxd/instance/filter.go
@@ -1,8 +1,8 @@
 package instance
 
 import (
-	"github.com/grant-he/lxd/lxd/filter"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/filter"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Filter returns a filtered list of instances that match the given clauses.
diff --git a/lxd/instance/instance_interface.go b/lxd/instance/instance_interface.go
index aa3e16d1ff..c096230bf3 100644
--- a/lxd/instance/instance_interface.go
+++ b/lxd/instance/instance_interface.go
@@ -7,14 +7,14 @@ import (
 
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
 )
 
 // HookStart hook used when instance has started.
diff --git a/lxd/instance/instance_utils.go b/lxd/instance/instance_utils.go
index 21784f4825..589ab7b567 100644
--- a/lxd/instance/instance_utils.go
+++ b/lxd/instance/instance_utils.go
@@ -12,22 +12,22 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/seccomp"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/seccomp"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // ValidDevices is linked from instance/drivers.validDevices to validate device config.
diff --git a/lxd/instance/instancetype/instance_type.go b/lxd/instance/instancetype/instance_type.go
index 085b8bf36b..55a040086a 100644
--- a/lxd/instance/instancetype/instance_type.go
+++ b/lxd/instance/instancetype/instance_type.go
@@ -3,7 +3,7 @@ package instancetype
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Type indicates the type of instance.
diff --git a/lxd/instance_backup.go b/lxd/instance_backup.go
index 4eed39e775..4f9dfd8011 100644
--- a/lxd/instance_backup.go
+++ b/lxd/instance_backup.go
@@ -10,15 +10,15 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 func containerBackupsGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_console.go b/lxd/instance_console.go
index 52ed8558ce..ea1c7e225d 100644
--- a/lxd/instance_console.go
+++ b/lxd/instance_console.go
@@ -14,17 +14,17 @@ import (
 	"golang.org/x/sys/unix"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/termios"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type consoleWs struct {
diff --git a/lxd/instance_delete.go b/lxd/instance_delete.go
index 8e17906637..963b31f20f 100644
--- a/lxd/instance_delete.go
+++ b/lxd/instance_delete.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
 )
 
 func containerDelete(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_exec.go b/lxd/instance_exec.go
index cbd7c339ea..76db1bfaee 100644
--- a/lxd/instance_exec.go
+++ b/lxd/instance_exec.go
@@ -15,20 +15,20 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/netutils"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/netutils"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type execWs struct {
diff --git a/lxd/instance_file.go b/lxd/instance_file.go
index a9aa067d56..62265d8964 100644
--- a/lxd/instance_file.go
+++ b/lxd/instance_file.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
 )
 
 func containerFileHandler(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_get.go b/lxd/instance_get.go
index 107d5d5c2e..ca615bc470 100644
--- a/lxd/instance_get.go
+++ b/lxd/instance_get.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/response"
 )
 
 func containerGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go
index 715b7e23dc..b1c5e286ea 100644
--- a/lxd/instance_instance_types.go
+++ b/lxd/instance_instance_types.go
@@ -10,15 +10,15 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
-
-	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
+
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 type instanceType struct {
diff --git a/lxd/instance_logs.go b/lxd/instance_logs.go
index 97b6c66c8b..c63fb5afde 100644
--- a/lxd/instance_logs.go
+++ b/lxd/instance_logs.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var instanceLogCmd = APIEndpoint{
diff --git a/lxd/instance_metadata.go b/lxd/instance_metadata.go
index a9d3b6f659..4d15a40869 100644
--- a/lxd/instance_metadata.go
+++ b/lxd/instance_metadata.go
@@ -13,11 +13,11 @@ import (
 	"github.com/gorilla/mux"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/response"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/response"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func containerMetadataGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_patch.go b/lxd/instance_patch.go
index 5468db3f0f..af4cacf31a 100644
--- a/lxd/instance_patch.go
+++ b/lxd/instance_patch.go
@@ -9,15 +9,15 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	projecthelpers "github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	projecthelpers "github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 func containerPatch(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_post.go b/lxd/instance_post.go
index d2197b1303..218602a6b2 100644
--- a/lxd/instance_post.go
+++ b/lxd/instance_post.go
@@ -11,19 +11,19 @@ import (
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	driver "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	driver "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var internalClusterContainerMovedCmd = APIEndpoint{
diff --git a/lxd/instance_put.go b/lxd/instance_put.go
index 482b9fe899..5390756615 100644
--- a/lxd/instance_put.go
+++ b/lxd/instance_put.go
@@ -7,17 +7,17 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	projecthelpers "github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	projecthelpers "github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 /*
diff --git a/lxd/instance_snapshot.go b/lxd/instance_snapshot.go
index 2bdb5c140f..e54c90f741 100644
--- a/lxd/instance_snapshot.go
+++ b/lxd/instance_snapshot.go
@@ -12,18 +12,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/validate"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/version"
 )
 
 func containerSnapshotsGet(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_state.go b/lxd/instance_state.go
index 478f8ae441..dfcb4b15be 100644
--- a/lxd/instance_state.go
+++ b/lxd/instance_state.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func containerState(d *Daemon, r *http.Request) response.Response {
diff --git a/lxd/instance_test.go b/lxd/instance_test.go
index 0dd5d320ba..602079a4f8 100644
--- a/lxd/instance_test.go
+++ b/lxd/instance_test.go
@@ -6,16 +6,16 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	instanceDrivers "github.com/grant-he/lxd/lxd/instance/drivers"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	driver "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	driver "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
 )
 
 type containerTestSuite struct {
diff --git a/lxd/instances.go b/lxd/instances.go
index fe865e7944..9bb2272725 100644
--- a/lxd/instances.go
+++ b/lxd/instances.go
@@ -8,13 +8,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var instancesCmd = APIEndpoint{
diff --git a/lxd/instances_get.go b/lxd/instances_get.go
index 025e0bcda7..eb503044e7 100644
--- a/lxd/instances_get.go
+++ b/lxd/instances_get.go
@@ -12,17 +12,17 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/filter"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/filter"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // urlInstanceTypeDetect detects what sort of instance type filter is being requested. Either
diff --git a/lxd/instances_post.go b/lxd/instances_post.go
index 521a802216..3a7028a1de 100644
--- a/lxd/instances_post.go
+++ b/lxd/instances_post.go
@@ -15,22 +15,22 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	projecthelpers "github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/revert"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	projecthelpers "github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/revert"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 func createFromImage(d *Daemon, project string, req *api.InstancesPost) response.Response {
diff --git a/lxd/logging.go b/lxd/logging.go
index 761fd38c47..6b8d5f1918 100644
--- a/lxd/logging.go
+++ b/lxd/logging.go
@@ -7,17 +7,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
-
-	log "github.com/grant-he/lxd/shared/log15"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
+
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // This task function expires logs when executed. It's started by the Daemon
diff --git a/lxd/maas/controller.go b/lxd/maas/controller.go
index 1f20e51809..15465afc61 100644
--- a/lxd/maas/controller.go
+++ b/lxd/maas/controller.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/juju/gomaasapi"
 
-	"github.com/grant-he/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/project"
 )
 
 // Instance is a MAAS specific instance interface.
diff --git a/lxd/main.go b/lxd/main.go
index 0f33a9da5f..f8c3f83dba 100644
--- a/lxd/main.go
+++ b/lxd/main.go
@@ -8,14 +8,14 @@ import (
 	"github.com/canonical/go-dqlite"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/events"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/events"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Initialize the random number generator
diff --git a/lxd/main_activateifneeded.go b/lxd/main_activateifneeded.go
index c81b23c24c..a9142c4ab3 100644
--- a/lxd/main_activateifneeded.go
+++ b/lxd/main_activateifneeded.go
@@ -8,14 +8,14 @@ import (
 	sqlite3 "github.com/mattn/go-sqlite3"
 	"github.com/spf13/cobra"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func init() {
diff --git a/lxd/main_callhook.go b/lxd/main_callhook.go
index ea2f753732..84390f87ec 100644
--- a/lxd/main_callhook.go
+++ b/lxd/main_callhook.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
+	"github.com/lxc/lxd/client"
 )
 
 type cmdCallhook struct {
diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go
index acf210c1fd..30e352014f 100644
--- a/lxd/main_checkfeature.go
+++ b/lxd/main_checkfeature.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"runtime"
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 /*
diff --git a/lxd/main_cluster.go b/lxd/main_cluster.go
index f01dfdc1db..e15b218ad9 100644
--- a/lxd/main_cluster.go
+++ b/lxd/main_cluster.go
@@ -7,13 +7,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxc/utils"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxc/utils"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/lxd/main_daemon.go b/lxd/main_daemon.go
index 17eeb6af24..99ad98ea53 100644
--- a/lxd/main_daemon.go
+++ b/lxd/main_daemon.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type cmdDaemon struct {
diff --git a/lxd/main_forkdns.go b/lxd/main_forkdns.go
index cce87856d7..69406b7ff4 100644
--- a/lxd/main_forkdns.go
+++ b/lxd/main_forkdns.go
@@ -14,11 +14,11 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/fsnotify.v0"
 
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/dnsutil"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/dnsutil"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 type cmdForkDNS struct {
diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go
index fe095dd769..96a5fa4ede 100644
--- a/lxd/main_forkexec.go
+++ b/lxd/main_forkexec.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forkmount.go b/lxd/main_forkmount.go
index 01c9660c40..27440000f9 100644
--- a/lxd/main_forkmount.go
+++ b/lxd/main_forkmount.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forknet.go b/lxd/main_forknet.go
index 8ad5b5d298..c37ec992d9 100644
--- a/lxd/main_forknet.go
+++ b/lxd/main_forknet.go
@@ -7,9 +7,9 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 
-	"github.com/grant-he/lxd/shared/netutils"
+	"github.com/lxc/lxd/shared/netutils"
 )
 
 /*
@@ -117,7 +117,7 @@ void forknet(void)
 }
 */
 import "C"
-import "github.com/grant-he/lxd/shared"
+import "github.com/lxc/lxd/shared"
 
 type cmdForknet struct {
 	global *cmdGlobal
diff --git a/lxd/main_forkproxy.go b/lxd/main_forkproxy.go
index bcb95bf7f4..81d034b9fa 100644
--- a/lxd/main_forkproxy.go
+++ b/lxd/main_forkproxy.go
@@ -16,13 +16,13 @@ import (
 	"golang.org/x/sys/unix"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/device"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/netutils"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/device"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/netutils"
 )
 
 /*
diff --git a/lxd/main_forkproxy_test.go b/lxd/main_forkproxy_test.go
index 8b6966ef29..dac9682d5a 100644
--- a/lxd/main_forkproxy_test.go
+++ b/lxd/main_forkproxy_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grant-he/lxd/lxd/device"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
 )
 
 func TestParseAddr(t *testing.T) {
diff --git a/lxd/main_forkstart.go b/lxd/main_forkstart.go
index 8d5db157be..c2707811bf 100644
--- a/lxd/main_forkstart.go
+++ b/lxd/main_forkstart.go
@@ -8,7 +8,7 @@ import (
 	"golang.org/x/sys/unix"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 type cmdForkstart struct {
diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
index aef1095019..be2839f2a0 100644
--- a/lxd/main_forksyscall.go
+++ b/lxd/main_forksyscall.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forkzfs.go b/lxd/main_forkzfs.go
index d06aa6fe7b..3ce0e06863 100644
--- a/lxd/main_forkzfs.go
+++ b/lxd/main_forkzfs.go
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 type cmdForkZFS struct {
diff --git a/lxd/main_import.go b/lxd/main_import.go
index a6db1f668b..46716805c3 100644
--- a/lxd/main_import.go
+++ b/lxd/main_import.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
+	"github.com/lxc/lxd/client"
 )
 
 type cmdImport struct {
diff --git a/lxd/main_init.go b/lxd/main_init.go
index 534c0b3c16..ca0bcb8eb7 100644
--- a/lxd/main_init.go
+++ b/lxd/main_init.go
@@ -6,13 +6,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/sys"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
 )
 
 type cmdInitData struct {
diff --git a/lxd/main_init_auto.go b/lxd/main_init_auto.go
index 025f51c548..d19fee6a8e 100644
--- a/lxd/main_init_auto.go
+++ b/lxd/main_init_auto.go
@@ -6,12 +6,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/project"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/project"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func (c *cmdInit) RunAuto(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) {
diff --git a/lxd/main_init_dump.go b/lxd/main_init_dump.go
index 57ce55e19b..835b7b9d8c 100644
--- a/lxd/main_init_dump.go
+++ b/lxd/main_init_dump.go
@@ -6,9 +6,9 @@ import (
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/shared/api"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func (c *cmdInit) RunDump(d lxd.InstanceServer) error {
diff --git a/lxd/main_init_interactive.go b/lxd/main_init_interactive.go
index 889c59e6c2..dfc8f0c0de 100644
--- a/lxd/main_init_interactive.go
+++ b/lxd/main_init_interactive.go
@@ -15,17 +15,17 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/validate"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/version"
 )
 
 func (c *cmdInit) RunInteractive(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) {
diff --git a/lxd/main_init_preseed.go b/lxd/main_init_preseed.go
index 4708b1fb25..c6b5349494 100644
--- a/lxd/main_init_preseed.go
+++ b/lxd/main_init_preseed.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/client"
+	"github.com/lxc/lxd/client"
 )
 
 func (c *cmdInit) RunPreseed(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) {
diff --git a/lxd/main_manpage.go b/lxd/main_manpage.go
index e0762f3f58..4860d3ed95 100644
--- a/lxd/main_manpage.go
+++ b/lxd/main_manpage.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	cli "github.com/grant-he/lxd/shared/cmd"
+	cli "github.com/lxc/lxd/shared/cmd"
 )
 
 type cmdManpage struct {
diff --git a/lxd/main_migratedumpsuccess.go b/lxd/main_migratedumpsuccess.go
index c8d79f7a80..de87f4b3be 100644
--- a/lxd/main_migratedumpsuccess.go
+++ b/lxd/main_migratedumpsuccess.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type cmdMigratedumpsuccess struct {
diff --git a/lxd/main_netcat.go b/lxd/main_netcat.go
index 25281f1401..aec3c102bc 100644
--- a/lxd/main_netcat.go
+++ b/lxd/main_netcat.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/eagain"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/eagain"
 )
 
 type cmdNetcat struct {
diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go
index 6f6928ef1e..3bfe019832 100644
--- a/lxd/main_nsexec.go
+++ b/lxd/main_nsexec.go
@@ -20,7 +20,7 @@ package main
 
 import (
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_shutdown.go b/lxd/main_shutdown.go
index 62e5b1d61b..dde6e493b6 100644
--- a/lxd/main_shutdown.go
+++ b/lxd/main_shutdown.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
+	"github.com/lxc/lxd/client"
 )
 
 type cmdShutdown struct {
diff --git a/lxd/main_sql.go b/lxd/main_sql.go
index 0e97b7cb95..a6ee638a5a 100644
--- a/lxd/main_sql.go
+++ b/lxd/main_sql.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared"
 )
 
 type cmdSql struct {
diff --git a/lxd/main_test.go b/lxd/main_test.go
index 051c7152ee..0e255ad60a 100644
--- a/lxd/main_test.go
+++ b/lxd/main_test.go
@@ -5,14 +5,14 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/sys"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
 )
 
 func mockStartDaemon() (*Daemon, error) {
diff --git a/lxd/main_version.go b/lxd/main_version.go
index ba7dfa4d7c..9396b336e9 100644
--- a/lxd/main_version.go
+++ b/lxd/main_version.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cli "github.com/grant-he/lxd/shared/cmd"
-	"github.com/grant-he/lxd/shared/version"
+	cli "github.com/lxc/lxd/shared/cmd"
+	"github.com/lxc/lxd/shared/version"
 )
 
 type cmdVersion struct {
diff --git a/lxd/main_waitready.go b/lxd/main_waitready.go
index be100a323d..da9caca5d6 100644
--- a/lxd/main_waitready.go
+++ b/lxd/main_waitready.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type cmdWaitready struct {
diff --git a/lxd/migrate.go b/lxd/migrate.go
index 02896f481c..7acefe4ce1 100644
--- a/lxd/migrate.go
+++ b/lxd/migrate.go
@@ -18,12 +18,12 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type migrationFields struct {
diff --git a/lxd/migrate_instance.go b/lxd/migrate_instance.go
index 887d2e0829..e55969a02a 100644
--- a/lxd/migrate_instance.go
+++ b/lxd/migrate_instance.go
@@ -16,19 +16,19 @@ import (
 	"github.com/pkg/errors"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func newMigrationSource(inst instance.Instance, stateful bool, instanceOnly bool) (*migrationSourceWs, error) {
diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go
index eb86dc9335..cb28c506a6 100644
--- a/lxd/migrate_storage_volumes.go
+++ b/lxd/migrate_storage_volumes.go
@@ -6,14 +6,14 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func newStorageMigrationSource(volumeOnly bool) (*migrationSourceWs, error) {
diff --git a/lxd/migration/migration_volumes.go b/lxd/migration/migration_volumes.go
index 23029fcce2..1aa186332f 100644
--- a/lxd/migration/migration_volumes.go
+++ b/lxd/migration/migration_volumes.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // Type represents the migration transport type. It indicates the method by which the migration can
diff --git a/lxd/migration/wsproto.go b/lxd/migration/wsproto.go
index 43a8a335f8..7ba37b29fb 100644
--- a/lxd/migration/wsproto.go
+++ b/lxd/migration/wsproto.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // ProtoRecv gets a protobuf message from a websocket
diff --git a/lxd/network/driver_bridge.go b/lxd/network/driver_bridge.go
index 9c3606c182..ec30df98ca 100644
--- a/lxd/network/driver_bridge.go
+++ b/lxd/network/driver_bridge.go
@@ -18,22 +18,22 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/apparmor"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/daemon"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/dnsmasq"
-	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
-	"github.com/grant-he/lxd/lxd/network/openvswitch"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/subprocess"
-	"github.com/grant-he/lxd/shared/validate"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/apparmor"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/daemon"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/dnsmasq"
+	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
+	"github.com/lxc/lxd/lxd/network/openvswitch"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/subprocess"
+	"github.com/lxc/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // ForkdnsServersListPath defines the path that contains the forkdns server candidate file.
diff --git a/lxd/network/driver_common.go b/lxd/network/driver_common.go
index b31b182b52..23cff9a58c 100644
--- a/lxd/network/driver_common.go
+++ b/lxd/network/driver_common.go
@@ -8,16 +8,16 @@ import (
 
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/validate"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // Info represents information about a network driver.
diff --git a/lxd/network/driver_macvlan.go b/lxd/network/driver_macvlan.go
index 0486569132..09c15a174f 100644
--- a/lxd/network/driver_macvlan.go
+++ b/lxd/network/driver_macvlan.go
@@ -3,12 +3,12 @@ package network
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // macvlan represents a LXD macvlan network.
diff --git a/lxd/network/driver_ovn.go b/lxd/network/driver_ovn.go
index af2794d046..950ac04be9 100644
--- a/lxd/network/driver_ovn.go
+++ b/lxd/network/driver_ovn.go
@@ -15,19 +15,19 @@ import (
 	"github.com/mdlayher/netx/eui64"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/locking"
-	"github.com/grant-he/lxd/lxd/network/openvswitch"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/locking"
+	"github.com/lxc/lxd/lxd/network/openvswitch"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 const ovnChassisPriorityMax = 32767
diff --git a/lxd/network/driver_physical.go b/lxd/network/driver_physical.go
index 590eb741aa..3d24584924 100644
--- a/lxd/network/driver_physical.go
+++ b/lxd/network/driver_physical.go
@@ -6,14 +6,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // physical represents a LXD physical network.
diff --git a/lxd/network/driver_sriov.go b/lxd/network/driver_sriov.go
index 3f341917b8..299e2dd2df 100644
--- a/lxd/network/driver_sriov.go
+++ b/lxd/network/driver_sriov.go
@@ -3,12 +3,12 @@ package network
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // sriov represents a LXD sriov network.
diff --git a/lxd/network/network_interface.go b/lxd/network/network_interface.go
index fb0cd33e69..b9ba1e89d1 100644
--- a/lxd/network/network_interface.go
+++ b/lxd/network/network_interface.go
@@ -3,11 +3,11 @@ package network
 import (
 	"net"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Type represents an LXD network driver type.
diff --git a/lxd/network/network_load.go b/lxd/network/network_load.go
index 219a783665..7098181a57 100644
--- a/lxd/network/network_load.go
+++ b/lxd/network/network_load.go
@@ -1,7 +1,7 @@
 package network
 
 import (
-	"github.com/grant-he/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/state"
 )
 
 var drivers = map[string]func() Network{
diff --git a/lxd/network/network_utils.go b/lxd/network/network_utils.go
index 7c57b48ec5..54793215d2 100644
--- a/lxd/network/network_utils.go
+++ b/lxd/network/network_utils.go
@@ -18,20 +18,20 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/dnsmasq"
-	"github.com/grant-he/lxd/lxd/dnsmasq/dhcpalloc"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/dnsmasq"
+	"github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // validInterfaceName validates a real network interface name.
diff --git a/lxd/network/network_utils_bridge.go b/lxd/network/network_utils_bridge.go
index ba1d68deef..f19b313e8d 100644
--- a/lxd/network/network_utils_bridge.go
+++ b/lxd/network/network_utils_bridge.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/network/openvswitch"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/network/openvswitch"
+	"github.com/lxc/lxd/shared"
 )
 
 // BridgeVLANFilteringStatus returns whether VLAN filtering is enabled on a bridge interface.
diff --git a/lxd/network/openvswitch/ovn.go b/lxd/network/openvswitch/ovn.go
index acb49a1228..643e6d7047 100644
--- a/lxd/network/openvswitch/ovn.go
+++ b/lxd/network/openvswitch/ovn.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // OVNRouter OVN router name.
diff --git a/lxd/network/openvswitch/ovs.go b/lxd/network/openvswitch/ovs.go
index 2f110fe849..478d9325aa 100644
--- a/lxd/network/openvswitch/ovs.go
+++ b/lxd/network/openvswitch/ovs.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // ovnBridgeMappingMutex locks access to read/write external-ids:ovn-bridge-mappings.
diff --git a/lxd/networks.go b/lxd/networks.go
index e98f3c70a0..09ea358629 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -12,25 +12,25 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/device/nictype"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/network/openvswitch"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/device/nictype"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/network/openvswitch"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Lock to prevent concurent networks creation
diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index ea72336827..dc8e834353 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -8,14 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/network"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/network"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func readUint(path string) (uint64, error) {
diff --git a/lxd/node/config.go b/lxd/node/config.go
index bc1ff64c63..2756f7601c 100644
--- a/lxd/node/config.go
+++ b/lxd/node/config.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/grant-he/lxd/lxd/config"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/config"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/node/config_test.go b/lxd/node/config_test.go
index e7b5408163..fb20433f97 100644
--- a/lxd/node/config_test.go
+++ b/lxd/node/config_test.go
@@ -3,8 +3,8 @@ package node_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/node/raft.go b/lxd/node/raft.go
index cf5e36f9f0..a6c34b8656 100644
--- a/lxd/node/raft.go
+++ b/lxd/node/raft.go
@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 // DetermineRaftNode figures out what raft node ID and address we have, if any.
diff --git a/lxd/node/raft_test.go b/lxd/node/raft_test.go
index 6d8f0aaa56..88bfacccd1 100644
--- a/lxd/node/raft_test.go
+++ b/lxd/node/raft_test.go
@@ -3,8 +3,8 @@ package node_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/lxd/operations.go b/lxd/operations.go
index fbd7ffb680..b46427f1cf 100644
--- a/lxd/operations.go
+++ b/lxd/operations.go
@@ -9,17 +9,17 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var operationCmd = APIEndpoint{
diff --git a/lxd/operations/linux.go b/lxd/operations/linux.go
index 285b9df6a2..10005a57ec 100644
--- a/lxd/operations/linux.go
+++ b/lxd/operations/linux.go
@@ -5,7 +5,7 @@ package operations
 import (
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 func registerDBOperation(op *Operation, opType db.OperationType) error {
diff --git a/lxd/operations/notlinux.go b/lxd/operations/notlinux.go
index 96bc87df90..0c0d00b401 100644
--- a/lxd/operations/notlinux.go
+++ b/lxd/operations/notlinux.go
@@ -5,7 +5,7 @@ package operations
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 func registerDBOperation(op *Operation, opType db.OperationType) error {
diff --git a/lxd/operations/operations.go b/lxd/operations/operations.go
index 310227781e..7067bcebb1 100644
--- a/lxd/operations/operations.go
+++ b/lxd/operations/operations.go
@@ -9,15 +9,15 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/events"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/events"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var debug bool
diff --git a/lxd/operations/response.go b/lxd/operations/response.go
index 1909da358f..d22c5b9f6a 100644
--- a/lxd/operations/response.go
+++ b/lxd/operations/response.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Operation response
diff --git a/lxd/operations/websocket.go b/lxd/operations/websocket.go
index 8bb5447e13..f16005da85 100644
--- a/lxd/operations/websocket.go
+++ b/lxd/operations/websocket.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/websocket"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/shared"
 )
 
 type operationWebSocket struct {
diff --git a/lxd/patches.go b/lxd/patches.go
index 7cfb8a079b..ef0bbee33c 100644
--- a/lxd/patches.go
+++ b/lxd/patches.go
@@ -15,22 +15,22 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/db/query"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/rsync"
-	driver "github.com/grant-he/lxd/lxd/storage"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db/query"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/rsync"
+	driver "github.com/lxc/lxd/lxd/storage"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type patchStage int
diff --git a/lxd/patches_utils.go b/lxd/patches_utils.go
index 9948fe1d08..256422f32e 100644
--- a/lxd/patches_utils.go
+++ b/lxd/patches_utils.go
@@ -10,11 +10,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // For 'btrfs' storage backend.
diff --git a/lxd/profiles.go b/lxd/profiles.go
index 456c6ec033..2cba1eefa7 100644
--- a/lxd/profiles.go
+++ b/lxd/profiles.go
@@ -11,18 +11,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var profilesCmd = APIEndpoint{
diff --git a/lxd/profiles_utils.go b/lxd/profiles_utils.go
index 6c6d5061fa..2a6aa30700 100644
--- a/lxd/profiles_utils.go
+++ b/lxd/profiles_utils.go
@@ -3,13 +3,13 @@ package main
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	projecthelpers "github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	projecthelpers "github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/project/permissions.go b/lxd/project/permissions.go
index 5fc88c6951..3950396bb6 100644
--- a/lxd/project/permissions.go
+++ b/lxd/project/permissions.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceconfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/db"
+	deviceconfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // AllowInstanceCreation returns an error if any project-specific limit or
diff --git a/lxd/project/permissions_test.go b/lxd/project/permissions_test.go
index 6032becea2..ccede05630 100644
--- a/lxd/project/permissions_test.go
+++ b/lxd/project/permissions_test.go
@@ -3,10 +3,10 @@ package project_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/shared/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/project/project.go b/lxd/project/project.go
index 8934f1bd63..202f059650 100644
--- a/lxd/project/project.go
+++ b/lxd/project/project.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // Default is the string used for a default project.
diff --git a/lxd/project/project_test.go b/lxd/project/project_test.go
index c319d6fc54..43532a9f3b 100644
--- a/lxd/project/project_test.go
+++ b/lxd/project/project_test.go
@@ -3,7 +3,7 @@ package project_test
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/project"
 )
 
 func ExampleInstance() {
diff --git a/lxd/rbac/server.go b/lxd/rbac/server.go
index 51f7e5aa1b..4259c0fa8e 100644
--- a/lxd/rbac/server.go
+++ b/lxd/rbac/server.go
@@ -18,8 +18,8 @@ import (
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery/agent"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type rbacResource struct {
diff --git a/lxd/resources.go b/lxd/resources.go
index 15824d4963..620deecdfa 100644
--- a/lxd/resources.go
+++ b/lxd/resources.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/grant-he/lxd/lxd/resources"
-	"github.com/grant-he/lxd/lxd/response"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/resources"
+	"github.com/lxc/lxd/lxd/response"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var api10ResourcesCmd = APIEndpoint{
diff --git a/lxd/resources/cpu.go b/lxd/resources/cpu.go
index 1c220ca63d..70536f29f6 100644
--- a/lxd/resources/cpu.go
+++ b/lxd/resources/cpu.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var sysDevicesCPU = "/sys/devices/system/cpu"
diff --git a/lxd/resources/gpu.go b/lxd/resources/gpu.go
index 873c990cd3..0c9d260ed6 100644
--- a/lxd/resources/gpu.go
+++ b/lxd/resources/gpu.go
@@ -16,7 +16,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var sysClassDrm = "/sys/class/drm"
diff --git a/lxd/resources/memory.go b/lxd/resources/memory.go
index 223325a882..8fae70d2ac 100644
--- a/lxd/resources/memory.go
+++ b/lxd/resources/memory.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/units"
 )
 
 var sysDevicesNode = "/sys/devices/system/node"
diff --git a/lxd/resources/network.go b/lxd/resources/network.go
index 5ce9c7da81..3ab64405be 100644
--- a/lxd/resources/network.go
+++ b/lxd/resources/network.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var sysClassNet = "/sys/class/net"
diff --git a/lxd/resources/network_ethtool.go b/lxd/resources/network_ethtool.go
index 3d5011e1a5..1938cc8afe 100644
--- a/lxd/resources/network_ethtool.go
+++ b/lxd/resources/network_ethtool.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type ethtoolReq struct {
diff --git a/lxd/resources/pci.go b/lxd/resources/pci.go
index cb73286504..69c95e0bed 100644
--- a/lxd/resources/pci.go
+++ b/lxd/resources/pci.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // GetPCI returns a filled api.ResourcesPCI struct ready for use by LXD
diff --git a/lxd/resources/resources.go b/lxd/resources/resources.go
index 415da6c965..c35f8876eb 100644
--- a/lxd/resources/resources.go
+++ b/lxd/resources/resources.go
@@ -3,7 +3,7 @@ package resources
 import (
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 // GetResources returns a filled api.Resources struct ready for use by LXD
diff --git a/lxd/resources/storage.go b/lxd/resources/storage.go
index 0c89ad38ef..b051957f76 100644
--- a/lxd/resources/storage.go
+++ b/lxd/resources/storage.go
@@ -12,7 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var devDiskByPath = "/dev/disk/by-path"
diff --git a/lxd/resources/system.go b/lxd/resources/system.go
index 9db4ac24bf..a074b54888 100644
--- a/lxd/resources/system.go
+++ b/lxd/resources/system.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var sysClassDMIID = "/sys/class/dmi/id"
diff --git a/lxd/resources/usb.go b/lxd/resources/usb.go
index 69ee37a811..fc88c459dc 100644
--- a/lxd/resources/usb.go
+++ b/lxd/resources/usb.go
@@ -9,8 +9,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/usbid"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/usbid"
 )
 
 var sysBusUSB = "/sys/bus/usb/devices"
diff --git a/lxd/response.go b/lxd/response.go
index 424c925ae5..c511dca9a8 100644
--- a/lxd/response.go
+++ b/lxd/response.go
@@ -3,9 +3,9 @@ package main
 import (
 	"net/http"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/response"
 )
 
 // forwardedResponseIfTargetIsRemote redirects a request to the request has a
diff --git a/lxd/response/response.go b/lxd/response/response.go
index ac2a417d30..302c4eae09 100644
--- a/lxd/response/response.go
+++ b/lxd/response/response.go
@@ -10,10 +10,10 @@ import (
 	"os"
 	"time"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 var debug bool
diff --git a/lxd/response/smart.go b/lxd/response/smart.go
index 43c35a7a6c..95953513e5 100644
--- a/lxd/response/smart.go
+++ b/lxd/response/smart.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 )
 
 // SmartError returns the right error message based on err.
diff --git a/lxd/response/smart_linux.go b/lxd/response/smart_linux.go
index e40ca68720..96c8750528 100644
--- a/lxd/response/smart_linux.go
+++ b/lxd/response/smart_linux.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"github.com/canonical/go-dqlite/driver"
-	"github.com/grant-he/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/db"
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 )
diff --git a/lxd/revert/revert_test.go b/lxd/revert/revert_test.go
index e0206c8162..20b0fefb7b 100644
--- a/lxd/revert/revert_test.go
+++ b/lxd/revert/revert_test.go
@@ -3,7 +3,7 @@ package revert_test
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/revert"
 )
 
 func ExampleReverter_fail() {
diff --git a/lxd/rsync/rsync.go b/lxd/rsync/rsync.go
index 1e3ae46242..17dc94e9d4 100644
--- a/lxd/rsync/rsync.go
+++ b/lxd/rsync/rsync.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Debug controls additional debugging in rsync output.
diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
index 892ac8e36f..90be41223e 100644
--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
@@ -21,19 +21,19 @@ import (
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
-
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/ucred"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/netutils"
-	"github.com/grant-he/lxd/shared/osarch"
+	_ "github.com/lxc/lxd/lxd/include"
+
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/ucred"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/netutils"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 /*
diff --git a/lxd/state/notlinux.go b/lxd/state/notlinux.go
index 6706f8e753..bf769cac54 100644
--- a/lxd/state/notlinux.go
+++ b/lxd/state/notlinux.go
@@ -5,7 +5,7 @@ package state
 import (
 	"context"
 
-	"github.com/grant-he/lxd/lxd/events"
+	"github.com/lxc/lxd/lxd/events"
 )
 
 // State here is just an empty shim to statisfy dependencies.
diff --git a/lxd/state/state.go b/lxd/state/state.go
index 0deeaa8fb0..76805314c6 100644
--- a/lxd/state/state.go
+++ b/lxd/state/state.go
@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/endpoints"
-	"github.com/grant-he/lxd/lxd/events"
-	"github.com/grant-he/lxd/lxd/firewall"
-	"github.com/grant-he/lxd/lxd/maas"
-	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/endpoints"
+	"github.com/lxc/lxd/lxd/events"
+	"github.com/lxc/lxd/lxd/firewall"
+	"github.com/lxc/lxd/lxd/maas"
+	"github.com/lxc/lxd/lxd/sys"
 )
 
 // State is a gateway to the two main stateful components of LXD, the database
diff --git a/lxd/state/testing.go b/lxd/state/testing.go
index 6999b4291d..5f9e81eea4 100644
--- a/lxd/state/testing.go
+++ b/lxd/state/testing.go
@@ -6,9 +6,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/firewall"
-	"github.com/grant-he/lxd/lxd/sys"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/firewall"
+	"github.com/lxc/lxd/lxd/sys"
 )
 
 // NewTestState returns a State object initialized with testable instances of
diff --git a/lxd/storage.go b/lxd/storage.go
index da8a80e6f2..0b627bc2ea 100644
--- a/lxd/storage.go
+++ b/lxd/storage.go
@@ -8,15 +8,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Simply cache used to storage the activated drivers on this LXD instance. This
diff --git a/lxd/storage/backend_lxd.go b/lxd/storage/backend_lxd.go
index 315442de90..c1b63dad58 100644
--- a/lxd/storage/backend_lxd.go
+++ b/lxd/storage/backend_lxd.go
@@ -12,25 +12,25 @@ import (
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/locking"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/lxd/storage/memorypipe"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/locking"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/lxd/storage/memorypipe"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 type lxdBackend struct {
diff --git a/lxd/storage/backend_lxd_patches.go b/lxd/storage/backend_lxd_patches.go
index 470f1a32e4..5d58fa83e5 100644
--- a/lxd/storage/backend_lxd_patches.go
+++ b/lxd/storage/backend_lxd_patches.go
@@ -6,13 +6,13 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var lxdEarlyPatches = map[string]func(b *lxdBackend) error{}
diff --git a/lxd/storage/backend_mock.go b/lxd/storage/backend_mock.go
index 03de89c8cf..bfc443fa29 100644
--- a/lxd/storage/backend_mock.go
+++ b/lxd/storage/backend_mock.go
@@ -4,15 +4,15 @@ import (
 	"io"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type mockBackend struct {
diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go
index b30cb5a830..bbf1dd6280 100644
--- a/lxd/storage/drivers/driver_btrfs.go
+++ b/lxd/storage/drivers/driver_btrfs.go
@@ -10,13 +10,13 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 var btrfsVersion string
diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go
index cadb839e6c..e1a359e849 100644
--- a/lxd/storage/drivers/driver_btrfs_utils.go
+++ b/lxd/storage/drivers/driver_btrfs_utils.go
@@ -15,10 +15,10 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Errors
diff --git a/lxd/storage/drivers/driver_btrfs_volumes.go b/lxd/storage/drivers/driver_btrfs_volumes.go
index cc956e8bd7..edc331cf00 100644
--- a/lxd/storage/drivers/driver_btrfs_volumes.go
+++ b/lxd/storage/drivers/driver_btrfs_volumes.go
@@ -15,15 +15,15 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function.
diff --git a/lxd/storage/drivers/driver_ceph.go b/lxd/storage/drivers/driver_ceph.go
index ac8ac7d356..111d44239c 100644
--- a/lxd/storage/drivers/driver_ceph.go
+++ b/lxd/storage/drivers/driver_ceph.go
@@ -7,14 +7,14 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 var cephAllowedFilesystems = []string{"btrfs", "ext4", "xfs"}
diff --git a/lxd/storage/drivers/driver_ceph_utils.go b/lxd/storage/drivers/driver_ceph_utils.go
index 3c90ee5c3f..9d8f2590da 100644
--- a/lxd/storage/drivers/driver_ceph_utils.go
+++ b/lxd/storage/drivers/driver_ceph_utils.go
@@ -14,11 +14,11 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
 )
 
 const cephVolumeTypeZombieImage = VolumeType("zombie_image")
diff --git a/lxd/storage/drivers/driver_ceph_volumes.go b/lxd/storage/drivers/driver_ceph_volumes.go
index a15f43b11d..812dd998d3 100644
--- a/lxd/storage/drivers/driver_ceph_volumes.go
+++ b/lxd/storage/drivers/driver_ceph_volumes.go
@@ -11,17 +11,17 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied
diff --git a/lxd/storage/drivers/driver_cephfs.go b/lxd/storage/drivers/driver_cephfs.go
index 94270f98f0..29988cfc85 100644
--- a/lxd/storage/drivers/driver_cephfs.go
+++ b/lxd/storage/drivers/driver_cephfs.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 var cephfsVersion string
diff --git a/lxd/storage/drivers/driver_cephfs_utils.go b/lxd/storage/drivers/driver_cephfs_utils.go
index 19a4daf127..ada9f2e5a8 100644
--- a/lxd/storage/drivers/driver_cephfs_utils.go
+++ b/lxd/storage/drivers/driver_cephfs_utils.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // fsExists checks that the Ceph FS instance indeed exists.
diff --git a/lxd/storage/drivers/driver_cephfs_volumes.go b/lxd/storage/drivers/driver_cephfs_volumes.go
index c610970fa1..c5c28cb054 100644
--- a/lxd/storage/drivers/driver_cephfs_volumes.go
+++ b/lxd/storage/drivers/driver_cephfs_volumes.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // CreateVolume creates a new storage volume on disk.
diff --git a/lxd/storage/drivers/driver_common.go b/lxd/storage/drivers/driver_common.go
index d638f7e318..e15950acad 100644
--- a/lxd/storage/drivers/driver_common.go
+++ b/lxd/storage/drivers/driver_common.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type common struct {
diff --git a/lxd/storage/drivers/driver_dir.go b/lxd/storage/drivers/driver_dir.go
index 0ae9769072..df9023823e 100644
--- a/lxd/storage/drivers/driver_dir.go
+++ b/lxd/storage/drivers/driver_dir.go
@@ -7,9 +7,9 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 type dir struct {
diff --git a/lxd/storage/drivers/driver_dir_utils.go b/lxd/storage/drivers/driver_dir_utils.go
index ded28e8927..5badee6c3f 100644
--- a/lxd/storage/drivers/driver_dir_utils.go
+++ b/lxd/storage/drivers/driver_dir_utils.go
@@ -3,10 +3,10 @@ package drivers
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/storage/quota"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/storage/quota"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // withoutGetVolID returns a copy of this struct but with a volIDFunc which will cause quotas to be skipped.
diff --git a/lxd/storage/drivers/driver_dir_volumes.go b/lxd/storage/drivers/driver_dir_volumes.go
index 10882c5026..b0ffca80f1 100644
--- a/lxd/storage/drivers/driver_dir_volumes.go
+++ b/lxd/storage/drivers/driver_dir_volumes.go
@@ -7,15 +7,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/lxd/storage/quota"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/lxd/storage/quota"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied
diff --git a/lxd/storage/drivers/driver_lvm.go b/lxd/storage/drivers/driver_lvm.go
index d61cfb93a3..75fe9f0476 100644
--- a/lxd/storage/drivers/driver_lvm.go
+++ b/lxd/storage/drivers/driver_lvm.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 const lvmVgPoolMarker = "lxd_pool" // Indicator tag used to mark volume groups as in use by LXD.
diff --git a/lxd/storage/drivers/driver_lvm_patches.go b/lxd/storage/drivers/driver_lvm_patches.go
index 649ddb8a4f..082aedbafe 100644
--- a/lxd/storage/drivers/driver_lvm_patches.go
+++ b/lxd/storage/drivers/driver_lvm_patches.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // patchStorageSkipActivation set skipactivation=y on all LXD LVM logical volumes (excluding thin pool volumes).
diff --git a/lxd/storage/drivers/driver_lvm_utils.go b/lxd/storage/drivers/driver_lvm_utils.go
index fb36cd930f..9d4b2bed68 100644
--- a/lxd/storage/drivers/driver_lvm_utils.go
+++ b/lxd/storage/drivers/driver_lvm_utils.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/locking"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/locking"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // lvmBlockVolSuffix suffix used for block content type svolumes.
diff --git a/lxd/storage/drivers/driver_lvm_volumes.go b/lxd/storage/drivers/driver_lvm_volumes.go
index ef5b1f9b2f..dde586d978 100644
--- a/lxd/storage/drivers/driver_lvm_volumes.go
+++ b/lxd/storage/drivers/driver_lvm_volumes.go
@@ -13,15 +13,15 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/instancewriter"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function.
diff --git a/lxd/storage/drivers/driver_zfs.go b/lxd/storage/drivers/driver_zfs.go
index 0b0fb80ae5..31c4f3e771 100644
--- a/lxd/storage/drivers/driver_zfs.go
+++ b/lxd/storage/drivers/driver_zfs.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var zfsVersion string
diff --git a/lxd/storage/drivers/driver_zfs_patches.go b/lxd/storage/drivers/driver_zfs_patches.go
index 5937491323..abf8d09879 100644
--- a/lxd/storage/drivers/driver_zfs_patches.go
+++ b/lxd/storage/drivers/driver_zfs_patches.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 func (d *zfs) patchStorageCreateVM() error {
diff --git a/lxd/storage/drivers/driver_zfs_utils.go b/lxd/storage/drivers/driver_zfs_utils.go
index 621536dae4..13e59cb80f 100644
--- a/lxd/storage/drivers/driver_zfs_utils.go
+++ b/lxd/storage/drivers/driver_zfs_utils.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/ioprogress"
 )
 
 func (d *zfs) dataset(vol Volume, deleted bool) string {
diff --git a/lxd/storage/drivers/driver_zfs_volumes.go b/lxd/storage/drivers/driver_zfs_volumes.go
index 0565c27a78..e114c82e66 100644
--- a/lxd/storage/drivers/driver_zfs_volumes.go
+++ b/lxd/storage/drivers/driver_zfs_volumes.go
@@ -16,16 +16,16 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // CreateVolume creates an empty volume and can optionally fill it by executing the supplied
diff --git a/lxd/storage/drivers/drivers_mock.go b/lxd/storage/drivers/drivers_mock.go
index 207d9830d6..9f1c379179 100644
--- a/lxd/storage/drivers/drivers_mock.go
+++ b/lxd/storage/drivers/drivers_mock.go
@@ -3,11 +3,11 @@ package drivers
 import (
 	"io"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
 )
 
 type mock struct {
diff --git a/lxd/storage/drivers/generic_vfs.go b/lxd/storage/drivers/generic_vfs.go
index c9b200cf46..4f90dbb8b2 100644
--- a/lxd/storage/drivers/generic_vfs.go
+++ b/lxd/storage/drivers/generic_vfs.go
@@ -12,17 +12,17 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // genericVolumeDiskFile used to indicate the file name used for block volume disk files.
diff --git a/lxd/storage/drivers/interface.go b/lxd/storage/drivers/interface.go
index 41fa8685b5..82450ad5e5 100644
--- a/lxd/storage/drivers/interface.go
+++ b/lxd/storage/drivers/interface.go
@@ -3,13 +3,13 @@ package drivers
 import (
 	"io"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // driver is the extended internal interface.
diff --git a/lxd/storage/drivers/load.go b/lxd/storage/drivers/load.go
index 81ac54f86e..38e41058f6 100644
--- a/lxd/storage/drivers/load.go
+++ b/lxd/storage/drivers/load.go
@@ -1,8 +1,8 @@
 package drivers
 
 import (
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 var drivers = map[string]func() driver{
diff --git a/lxd/storage/drivers/utils.go b/lxd/storage/drivers/utils.go
index ea2adaecf5..c07f91928f 100644
--- a/lxd/storage/drivers/utils.go
+++ b/lxd/storage/drivers/utils.go
@@ -14,9 +14,9 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
 )
 
 // MinBlockBoundary minimum block boundary size to use.
diff --git a/lxd/storage/drivers/utils_cgo.go b/lxd/storage/drivers/utils_cgo.go
index 9c7e0c88bb..88309f5514 100644
--- a/lxd/storage/drivers/utils_cgo.go
+++ b/lxd/storage/drivers/utils_cgo.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/storage/drivers/volume.go b/lxd/storage/drivers/volume.go
index 834d26d5a4..2b36619f66 100644
--- a/lxd/storage/drivers/volume.go
+++ b/lxd/storage/drivers/volume.go
@@ -6,12 +6,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/locking"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/refcount"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/lxd/locking"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/refcount"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // tmpVolSuffix Suffix to use for any temporary volumes created by LXD.
diff --git a/lxd/storage/load.go b/lxd/storage/load.go
index 077a44d83e..1ccab79df0 100644
--- a/lxd/storage/load.go
+++ b/lxd/storage/load.go
@@ -3,16 +3,16 @@ package storage
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
 )
 
 // volIDFuncMake returns a function that can be supplied to the underlying storage drivers allowing
diff --git a/lxd/storage/pool_interface.go b/lxd/storage/pool_interface.go
index 38807bc864..5423c89829 100644
--- a/lxd/storage/pool_interface.go
+++ b/lxd/storage/pool_interface.go
@@ -4,13 +4,13 @@ import (
 	"io"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/instancewriter"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/instancewriter"
 )
 
 // MountInfo represents info about the result of a mount operation.
diff --git a/lxd/storage/quota/projectquota.go b/lxd/storage/quota/projectquota.go
index f0f767476e..395fe931fe 100644
--- a/lxd/storage/quota/projectquota.go
+++ b/lxd/storage/quota/projectquota.go
@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 /*
diff --git a/lxd/storage/storage.go b/lxd/storage/storage.go
index 44c2abd0d1..2c680aa8f6 100644
--- a/lxd/storage/storage.go
+++ b/lxd/storage/storage.go
@@ -3,9 +3,9 @@ package storage
 import (
 	"os"
 
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/shared"
 )
 
 // InstancePath returns the directory of an instance or snapshot.
diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go
index e291875f4c..1e2b7c9fab 100644
--- a/lxd/storage/utils.go
+++ b/lxd/storage/utils.go
@@ -12,25 +12,25 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/robfig/cron.v2"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/instance/instancetype"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/lxd/node"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/rsync"
-	"github.com/grant-he/lxd/lxd/state"
-	"github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/logging"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/instance/instancetype"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/lxd/node"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/rsync"
+	"github.com/lxc/lxd/lxd/state"
+	"github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/ioprogress"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logging"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 // ValidName validates the provided name, and returns an error if it's not a valid storage name.
diff --git a/lxd/storage_migration.go b/lxd/storage_migration.go
index 1af549ede3..5ff3e38896 100644
--- a/lxd/storage_migration.go
+++ b/lxd/storage_migration.go
@@ -3,11 +3,11 @@ package main
 import (
 	"time"
 
-	"github.com/grant-he/lxd/lxd/db"
-	deviceConfig "github.com/grant-he/lxd/lxd/device/config"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/migration"
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/lxd/db"
+	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/migration"
+	"github.com/lxc/lxd/shared"
 )
 
 func snapshotProtobufToInstanceArgs(inst instance.Instance, snap *migration.Snapshot) db.InstanceArgs {
diff --git a/lxd/storage_pools.go b/lxd/storage_pools.go
index f5df93d12b..c631d7cbc7 100644
--- a/lxd/storage_pools.go
+++ b/lxd/storage_pools.go
@@ -10,15 +10,15 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	lxd "github.com/grant-he/lxd/client"
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/response"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	lxd "github.com/lxc/lxd/client"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/response"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 // Lock to prevent concurent storage pools creation
diff --git a/lxd/storage_pools_config.go b/lxd/storage_pools_config.go
index 991c089458..09916394bf 100644
--- a/lxd/storage_pools_config.go
+++ b/lxd/storage_pools_config.go
@@ -7,10 +7,10 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	storageDrivers "github.com/grant-he/lxd/lxd/storage/drivers"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	storageDrivers "github.com/lxc/lxd/lxd/storage/drivers"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 var storagePoolConfigKeys = map[string]func(value string) error{
diff --git a/lxd/storage_pools_utils.go b/lxd/storage_pools_utils.go
index 4afdd31b75..57cc08b74f 100644
--- a/lxd/storage_pools_utils.go
+++ b/lxd/storage_pools_utils.go
@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
 )
 
 func storagePoolUpdate(state *state.State, name, newDescription string, newConfig map[string]string, withDB bool) error {
diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go
index 58ab965296..2c95560f3e 100644
--- a/lxd/storage_volumes.go
+++ b/lxd/storage_volumes.go
@@ -14,21 +14,21 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	"github.com/grant-he/lxd/lxd/revert"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	"github.com/lxc/lxd/lxd/revert"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/storage_volumes_backup.go b/lxd/storage_volumes_backup.go
index 88ccf400f2..fd52701dc4 100644
--- a/lxd/storage_volumes_backup.go
+++ b/lxd/storage_volumes_backup.go
@@ -8,16 +8,16 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 	"github.com/pkg/errors"
 )
 
diff --git a/lxd/storage_volumes_snapshot.go b/lxd/storage_volumes_snapshot.go
index 76f1013330..7d56b5cefd 100644
--- a/lxd/storage_volumes_snapshot.go
+++ b/lxd/storage_volumes_snapshot.go
@@ -17,19 +17,19 @@ import (
 	"github.com/pkg/errors"
 	cron "gopkg.in/robfig/cron.v2"
 
-	"github.com/grant-he/lxd/lxd/cluster"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/operations"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/response"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/lxd/task"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/cluster"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/operations"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/response"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/lxd/task"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var storagePoolVolumeSnapshotsTypeCmd = APIEndpoint{
diff --git a/lxd/storage_volumes_utils.go b/lxd/storage_volumes_utils.go
index f1d12093bd..a66d57f454 100644
--- a/lxd/storage_volumes_utils.go
+++ b/lxd/storage_volumes_utils.go
@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/backup"
-	"github.com/grant-he/lxd/lxd/db"
-	"github.com/grant-he/lxd/lxd/instance"
-	"github.com/grant-he/lxd/lxd/project"
-	"github.com/grant-he/lxd/lxd/state"
-	storagePools "github.com/grant-he/lxd/lxd/storage"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/version"
+	"github.com/lxc/lxd/lxd/backup"
+	"github.com/lxc/lxd/lxd/db"
+	"github.com/lxc/lxd/lxd/instance"
+	"github.com/lxc/lxd/lxd/project"
+	"github.com/lxc/lxd/lxd/state"
+	storagePools "github.com/lxc/lxd/lxd/storage"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/version"
 )
 
 var supportedVolumeTypes = []int{db.StoragePoolVolumeTypeContainer, db.StoragePoolVolumeTypeVM, db.StoragePoolVolumeTypeCustom, db.StoragePoolVolumeTypeImage}
diff --git a/lxd/sys/apparmor.go b/lxd/sys/apparmor.go
index 9377245c4e..ae6a3b3a4c 100644
--- a/lxd/sys/apparmor.go
+++ b/lxd/sys/apparmor.go
@@ -9,12 +9,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/syndtr/gocapability/capability"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // Initialize AppArmor-specific attributes.
diff --git a/lxd/sys/os.go b/lxd/sys/os.go
index 03e8958203..0ab6d8f281 100644
--- a/lxd/sys/os.go
+++ b/lxd/sys/os.go
@@ -8,13 +8,13 @@ import (
 	"strconv"
 	"sync"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 
-	"github.com/grant-he/lxd/lxd/cgroup"
-	"github.com/grant-he/lxd/lxd/util"
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/lxd/cgroup"
+	"github.com/lxc/lxd/lxd/util"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // InotifyTargetInfo records the inotify information associated with a given
diff --git a/lxd/task/group_test.go b/lxd/task/group_test.go
index 6472069580..a542b9b711 100644
--- a/lxd/task/group_test.go
+++ b/lxd/task/group_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/task"
+	"github.com/lxc/lxd/lxd/task"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/task/task_test.go b/lxd/task/task_test.go
index c4fb422aa4..1fad2dbe7f 100644
--- a/lxd/task/task_test.go
+++ b/lxd/task/task_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/lxd/task"
+	"github.com/lxc/lxd/lxd/task"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/lxd/util/config.go b/lxd/util/config.go
index 497bcd5bfd..f8c0969dc7 100644
--- a/lxd/util/config.go
+++ b/lxd/util/config.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // CompareConfigs compares two config maps and returns an error if they differ.
diff --git a/lxd/util/config_test.go b/lxd/util/config_test.go
index da53314491..4373149d8b 100644
--- a/lxd/util/config_test.go
+++ b/lxd/util/config_test.go
@@ -3,7 +3,7 @@ package util_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/util"
+	"github.com/lxc/lxd/lxd/util"
 	"github.com/mpvl/subtest"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/lxd/util/encryption.go b/lxd/util/encryption.go
index 7c13062c1b..8317f8de37 100644
--- a/lxd/util/encryption.go
+++ b/lxd/util/encryption.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 	"github.com/pkg/errors"
 
 	"golang.org/x/crypto/scrypt"
diff --git a/lxd/util/fs.go b/lxd/util/fs.go
index c62e4a11ba..0b9dfe9aac 100644
--- a/lxd/util/fs.go
+++ b/lxd/util/fs.go
@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // Filesystem magic numbers
diff --git a/lxd/util/http.go b/lxd/util/http.go
index a5208d010c..54988d107b 100644
--- a/lxd/util/http.go
+++ b/lxd/util/http.go
@@ -19,10 +19,10 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // WriteJSON encodes the body as JSON and sends it back to the client
diff --git a/lxd/util/kernel.go b/lxd/util/kernel.go
index d26725c508..4019477af7 100644
--- a/lxd/util/kernel.go
+++ b/lxd/util/kernel.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // LoadModule loads the kernel module with the given name, by invoking
diff --git a/lxd/util/net.go b/lxd/util/net.go
index 674b7b3ed6..f707737fe4 100644
--- a/lxd/util/net.go
+++ b/lxd/util/net.go
@@ -7,8 +7,8 @@ import (
 	"io/ioutil"
 	"net"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // InMemoryNetwork creates a fully in-memory listener and dial function.
diff --git a/lxd/util/net_test.go b/lxd/util/net_test.go
index dc63304696..9702629bc2 100644
--- a/lxd/util/net_test.go
+++ b/lxd/util/net_test.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/grant-he/lxd/lxd/util"
+	"github.com/lxc/lxd/lxd/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/lxd/util/sys.go b/lxd/util/sys.go
index d096697883..35afb59d84 100644
--- a/lxd/util/sys.go
+++ b/lxd/util/sys.go
@@ -8,12 +8,12 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 // GetArchitectures returns the list of supported architectures.
diff --git a/lxd/vsock/vsock.go b/lxd/vsock/vsock.go
index a64856adee..ccbe04317a 100644
--- a/lxd/vsock/vsock.go
+++ b/lxd/vsock/vsock.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/mdlayher/vsock"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Dial connects to a remote vsock.
diff --git a/shared/archive_linux.go b/shared/archive_linux.go
index bafd37ed51..17a4b9c208 100644
--- a/shared/archive_linux.go
+++ b/shared/archive_linux.go
@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func Unpack(file string, path string, blockBackend bool, runningInUserns bool, tracker *ioprogress.ProgressTracker) error {
diff --git a/shared/cert_test.go b/shared/cert_test.go
index 072cd8b5d5..a1874ece75 100644
--- a/shared/cert_test.go
+++ b/shared/cert_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // A new key pair is generated if none exists and saved to the appropriate
diff --git a/shared/cmd/ask.go b/shared/cmd/ask.go
index 0f7076a4c7..eb5edd078b 100644
--- a/shared/cmd/ask.go
+++ b/shared/cmd/ask.go
@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 var stdin = bufio.NewReader(os.Stdin)
diff --git a/shared/eagain/file_unix.go b/shared/eagain/file_unix.go
index 9a914bb445..bd671df906 100644
--- a/shared/eagain/file_unix.go
+++ b/shared/eagain/file_unix.go
@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Reader represents an io.Reader that handles EAGAIN
diff --git a/shared/generate/db.go b/shared/generate/db.go
index b73cc4b97d..6775c73a1d 100644
--- a/shared/generate/db.go
+++ b/shared/generate/db.go
@@ -6,9 +6,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/grant-he/lxd/shared/generate/db"
-	"github.com/grant-he/lxd/shared/generate/file"
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared/generate/db"
+	"github.com/lxc/lxd/shared/generate/file"
+	"github.com/lxc/lxd/shared/generate/lex"
 )
 
 // Return a new db command.
diff --git a/shared/generate/db/constants.go b/shared/generate/db/constants.go
index 9cc5888754..83e91219c1 100644
--- a/shared/generate/db/constants.go
+++ b/shared/generate/db/constants.go
@@ -4,8 +4,8 @@ package db
 var Imports = []string{
 	"database/sql",
 	"fmt",
-	"github.com/grant-he/lxd/lxd/db/cluster",
-	"github.com/grant-he/lxd/lxd/db/query",
-	"github.com/grant-he/lxd/shared/api",
+	"github.com/lxc/lxd/lxd/db/cluster",
+	"github.com/lxc/lxd/lxd/db/query",
+	"github.com/lxc/lxd/shared/api",
 	"github.com/pkg/errors",
 }
diff --git a/shared/generate/db/lex.go b/shared/generate/db/lex.go
index 0ce3c8dbe8..b2aa81dc3c 100644
--- a/shared/generate/db/lex.go
+++ b/shared/generate/db/lex.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared/generate/lex"
 )
 
 // Return the table name for the given database entity.
diff --git a/shared/generate/db/mapping.go b/shared/generate/db/mapping.go
index e3bb66d0b8..3d7df29efc 100644
--- a/shared/generate/db/mapping.go
+++ b/shared/generate/db/mapping.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/generate/lex"
 )
 
 // Mapping holds information for mapping database tables to a Go structure.
diff --git a/shared/generate/db/method.go b/shared/generate/db/method.go
index 6cac04f025..d89b8efc5f 100644
--- a/shared/generate/db/method.go
+++ b/shared/generate/db/method.go
@@ -5,8 +5,8 @@ import (
 	"go/ast"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/generate/file"
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared/generate/file"
+	"github.com/lxc/lxd/shared/generate/lex"
 	"github.com/pkg/errors"
 )
 
diff --git a/shared/generate/db/parse.go b/shared/generate/db/parse.go
index adc445f2b2..a4d44eec1d 100644
--- a/shared/generate/db/parse.go
+++ b/shared/generate/db/parse.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared/generate/lex"
 	"github.com/pkg/errors"
 )
 
@@ -31,8 +31,8 @@ func Packages() (map[string]*ast.Package, error) {
 }
 
 var defaultPackages = []string{
-	"github.com/grant-he/lxd/shared/api",
-	"github.com/grant-he/lxd/lxd/db",
+	"github.com/lxc/lxd/shared/api",
+	"github.com/lxc/lxd/lxd/db",
 }
 
 // Filters parses all filtering statement defined for the given entity. It
diff --git a/shared/generate/db/parse_test.go b/shared/generate/db/parse_test.go
index 44e488c7ce..a6045cff1a 100644
--- a/shared/generate/db/parse_test.go
+++ b/shared/generate/db/parse_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grant-he/lxd/shared/generate/db"
+	"github.com/lxc/lxd/shared/generate/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/shared/generate/db/schema.go b/shared/generate/db/schema.go
index 7bf92a3958..0d82f68e51 100644
--- a/shared/generate/db/schema.go
+++ b/shared/generate/db/schema.go
@@ -3,8 +3,8 @@ package db
 import (
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/lxd/db/cluster"
-	"github.com/grant-he/lxd/lxd/db/node"
+	"github.com/lxc/lxd/lxd/db/cluster"
+	"github.com/lxc/lxd/lxd/db/node"
 )
 
 // UpdateSchema updates the schema.go file of the cluster and node databases.
diff --git a/shared/generate/db/stmt.go b/shared/generate/db/stmt.go
index d9efa8802f..c48f3c8ccb 100644
--- a/shared/generate/db/stmt.go
+++ b/shared/generate/db/stmt.go
@@ -5,8 +5,8 @@ import (
 	"go/ast"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/generate/file"
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared/generate/file"
+	"github.com/lxc/lxd/shared/generate/lex"
 	"github.com/pkg/errors"
 )
 
diff --git a/shared/generate/lex/parse_test.go b/shared/generate/lex/parse_test.go
index a6533b3bd0..648aeb879c 100644
--- a/shared/generate/lex/parse_test.go
+++ b/shared/generate/lex/parse_test.go
@@ -3,13 +3,13 @@ package lex_test
 import (
 	"testing"
 
-	"github.com/grant-he/lxd/shared/generate/lex"
+	"github.com/lxc/lxd/shared/generate/lex"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestParse(t *testing.T) {
-	pkg, err := lex.Parse("github.com/grant-he/lxd/shared/generate/lex")
+	pkg, err := lex.Parse("github.com/lxc/lxd/shared/generate/lex")
 	require.NoError(t, err)
 
 	obj := pkg.Scope.Lookup("Parse")
diff --git a/shared/idmap/idmapset_linux.go b/shared/idmap/idmapset_linux.go
index 449ad8822b..fe98e731c0 100644
--- a/shared/idmap/idmapset_linux.go
+++ b/shared/idmap/idmapset_linux.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 	"github.com/pkg/errors"
 )
 
diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go
index a3726c381c..c61f534ca6 100644
--- a/shared/idmap/shift_linux.go
+++ b/shared/idmap/shift_linux.go
@@ -13,10 +13,10 @@ import (
 	"golang.org/x/sys/unix"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // #cgo LDFLAGS: -lacl
diff --git a/shared/instance.go b/shared/instance.go
index 0dfc45058e..023573a0cf 100644
--- a/shared/instance.go
+++ b/shared/instance.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/robfig/cron.v2"
 
-	"github.com/grant-he/lxd/shared/units"
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/units"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 type InstanceAction string
diff --git a/shared/instancewriter/instance_tar_writer.go b/shared/instancewriter/instance_tar_writer.go
index 79ea35be57..3a1599ad36 100644
--- a/shared/instancewriter/instance_tar_writer.go
+++ b/shared/instancewriter/instance_tar_writer.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/idmap"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/idmap"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // InstanceTarWriter provides a TarWriter implementation that handles ID shifting and hardlink tracking.
diff --git a/shared/json.go b/shared/json.go
index eed5d78158..09f1066653 100644
--- a/shared/json.go
+++ b/shared/json.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 type Jmap map[string]interface{}
diff --git a/shared/log15/handler.go b/shared/log15/handler.go
index 60abc7b858..a9efc113fc 100644
--- a/shared/log15/handler.go
+++ b/shared/log15/handler.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/grant-he/lxd/shared/log15/stack"
+	"github.com/lxc/lxd/shared/log15/stack"
 )
 
 // A Logger prints its log records by writing to a Handler.
diff --git a/shared/log15/root.go b/shared/log15/root.go
index a757d9c576..ed3a3cf54a 100644
--- a/shared/log15/root.go
+++ b/shared/log15/root.go
@@ -3,7 +3,7 @@ package log15
 import (
 	"os"
 
-	"github.com/grant-he/lxd/shared/log15/term"
+	"github.com/lxc/lxd/shared/log15/term"
 	"github.com/mattn/go-colorable"
 )
 
diff --git a/shared/logging/format.go b/shared/logging/format.go
index c0351cf9ea..13bca7acf2 100644
--- a/shared/logging/format.go
+++ b/shared/logging/format.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 const (
diff --git a/shared/logging/log.go b/shared/logging/log.go
index 09269bab88..673264bf1a 100644
--- a/shared/logging/log.go
+++ b/shared/logging/log.go
@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"time"
 
-	log "github.com/grant-he/lxd/shared/log15"
-	"github.com/grant-he/lxd/shared/log15/term"
+	log "github.com/lxc/lxd/shared/log15"
+	"github.com/lxc/lxd/shared/log15/term"
 
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // GetLogger returns a logger suitable for using as logger.Log.
diff --git a/shared/logging/log_posix.go b/shared/logging/log_posix.go
index 2b993e8cbf..91c1bebdc8 100644
--- a/shared/logging/log_posix.go
+++ b/shared/logging/log_posix.go
@@ -3,7 +3,7 @@
 package logging
 
 import (
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // getSystemHandler on Linux writes messages to syslog.
diff --git a/shared/logging/log_windows.go b/shared/logging/log_windows.go
index 83ef8584a6..467f9323c1 100644
--- a/shared/logging/log_windows.go
+++ b/shared/logging/log_windows.go
@@ -3,7 +3,7 @@
 package logging
 
 import (
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // getSystemHandler on Windows does nothing.
diff --git a/shared/logging/testing.go b/shared/logging/testing.go
index bd5d58a557..bad3375c9a 100644
--- a/shared/logging/testing.go
+++ b/shared/logging/testing.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	log "github.com/grant-he/lxd/shared/log15"
+	log "github.com/lxc/lxd/shared/log15"
 )
 
 // Testing installs a global logger that emits messages using the t.Logf method
diff --git a/shared/netutils/network_linux.go b/shared/netutils/network_linux.go
index b17a25221b..c006e7f388 100644
--- a/shared/netutils/network_linux.go
+++ b/shared/netutils/network_linux.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 // WebsocketExecMirror mirrors a websocket connection with a set of Writer/Reader.
diff --git a/shared/netutils/network_linux_cgo.go b/shared/netutils/network_linux_cgo.go
index 1509f91436..e161f37de3 100644
--- a/shared/netutils/network_linux_cgo.go
+++ b/shared/netutils/network_linux_cgo.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/grant-he/lxd/shared/api"
+	"github.com/lxc/lxd/shared/api"
 )
 
 /*
diff --git a/shared/network.go b/shared/network.go
index b1ab0fc223..3a49052850 100644
--- a/shared/network.go
+++ b/shared/network.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/logger"
 )
 
 func RFC3493Dialer(network, address string) (net.Conn, error) {
diff --git a/shared/osarch/architectures_linux.go b/shared/osarch/architectures_linux.go
index 20101a6a03..a87e795a8d 100644
--- a/shared/osarch/architectures_linux.go
+++ b/shared/osarch/architectures_linux.go
@@ -3,7 +3,7 @@
 package osarch
 
 import (
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // ArchitectureGetLocal returns the local hardware architecture
diff --git a/shared/osarch/tempfile_test.go b/shared/osarch/tempfile_test.go
index f0dae9a614..24a30b74ec 100644
--- a/shared/osarch/tempfile_test.go
+++ b/shared/osarch/tempfile_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // WriteTempFile writes content to a temporary file.
diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go
index f6aa5824a0..b7a0d1a124 100644
--- a/shared/simplestreams/products.go
+++ b/shared/simplestreams/products.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 // Products represents the base of download.json
diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go
index 8e7fa40d00..4d623f6eb2 100644
--- a/shared/simplestreams/simplestreams.go
+++ b/shared/simplestreams/simplestreams.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 var urlDefaultOS = map[string]string{
diff --git a/shared/simplestreams/sort.go b/shared/simplestreams/sort.go
index 189a6d7f64..d22b13aff8 100644
--- a/shared/simplestreams/sort.go
+++ b/shared/simplestreams/sort.go
@@ -1,8 +1,8 @@
 package simplestreams
 
 import (
-	"github.com/grant-he/lxd/shared/api"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 var nativeName, _ = osarch.ArchitectureGetLocal()
diff --git a/shared/subprocess/proc.go b/shared/subprocess/proc.go
index ba133134cc..27ee69d7e8 100644
--- a/shared/subprocess/proc.go
+++ b/shared/subprocess/proc.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // Process struct. Has ability to set runtime arguments
diff --git a/shared/termios/termios_unix.go b/shared/termios/termios_unix.go
index e2ccffc950..7d9622fc08 100644
--- a/shared/termios/termios_unix.go
+++ b/shared/termios/termios_unix.go
@@ -7,7 +7,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared"
+	"github.com/lxc/lxd/shared"
 )
 
 // #include <termios.h>
diff --git a/shared/util.go b/shared/util.go
index 4aced535c3..ed0bc08553 100644
--- a/shared/util.go
+++ b/shared/util.go
@@ -27,9 +27,9 @@ import (
 	"github.com/flosch/pongo2"
 	"github.com/pkg/errors"
 
-	"github.com/grant-he/lxd/shared/cancel"
-	"github.com/grant-he/lxd/shared/ioprogress"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared/cancel"
+	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/lxc/lxd/shared/units"
 )
 
 const SnapshotDelimiter = "/"
diff --git a/shared/util_linux.go b/shared/util_linux.go
index 8e2d0f8bdc..ee689dd8aa 100644
--- a/shared/util_linux.go
+++ b/shared/util_linux.go
@@ -17,8 +17,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/grant-he/lxd/shared/logger"
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared/logger"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // --- pure Go functions ---
diff --git a/shared/util_linux_cgo.go b/shared/util_linux_cgo.go
index f4fcd4a861..155975d265 100644
--- a/shared/util_linux_cgo.go
+++ b/shared/util_linux_cgo.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	// Used by cgo
-	_ "github.com/grant-he/lxd/lxd/include"
+	_ "github.com/lxc/lxd/lxd/include"
 
 	"golang.org/x/sys/unix"
 )
diff --git a/shared/validate/validate.go b/shared/validate/validate.go
index f23842894a..70ac4ef807 100644
--- a/shared/validate/validate.go
+++ b/shared/validate/validate.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/grant-he/lxd/shared/units"
+	"github.com/lxc/lxd/shared/units"
 )
 
 // stringInSlice checks whether the supplied string is present in the supplied slice.
diff --git a/shared/validate/validate_test.go b/shared/validate/validate_test.go
index 06642b65ef..e5d6991841 100644
--- a/shared/validate/validate_test.go
+++ b/shared/validate/validate_test.go
@@ -3,7 +3,7 @@ package validate_test
 import (
 	"fmt"
 
-	"github.com/grant-he/lxd/shared/validate"
+	"github.com/lxc/lxd/shared/validate"
 )
 
 func ExampleIsNetworkMAC() {
diff --git a/shared/version/platform_linux.go b/shared/version/platform_linux.go
index dbf0f0fe5b..c6c3a87b57 100644
--- a/shared/version/platform_linux.go
+++ b/shared/version/platform_linux.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/grant-he/lxd/shared"
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 func getPlatformVersionStrings() []string {
diff --git a/shared/version/useragent.go b/shared/version/useragent.go
index 61c199c057..83bf047517 100644
--- a/shared/version/useragent.go
+++ b/shared/version/useragent.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/grant-he/lxd/shared/osarch"
+	"github.com/lxc/lxd/shared/osarch"
 )
 
 // UserAgent contains a string suitable as a user-agent


More information about the lxc-devel mailing list