diff --git a/src/main/java/org/libusb4java/BosDescriptor.java b/src/main/java/org/libusb4java/BosDescriptor.java
index 0fbb100..2d03e1c 100644
--- a/src/main/java/org/libusb4java/BosDescriptor.java
+++ b/src/main/java/org/libusb4java/BosDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/org/libusb4java/BosDevCapabilityDescriptor.java b/src/main/java/org/libusb4java/BosDevCapabilityDescriptor.java
index 4edc0b8..263e918 100644
--- a/src/main/java/org/libusb4java/BosDevCapabilityDescriptor.java
+++ b/src/main/java/org/libusb4java/BosDevCapabilityDescriptor.java
@@ -16,14 +16,14 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * A generic representation of a BOS Device Capability descriptor.
diff --git a/src/main/java/org/libusb4java/ConfigDescriptor.java b/src/main/java/org/libusb4java/ConfigDescriptor.java
index a5055cb..efb426a 100644
--- a/src/main/java/org/libusb4java/ConfigDescriptor.java
+++ b/src/main/java/org/libusb4java/ConfigDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
@@ -25,7 +25,7 @@ import javax.usb.UsbConfigurationDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB configuration descriptor.
diff --git a/src/main/java/org/libusb4java/ContainerIdDescriptor.java b/src/main/java/org/libusb4java/ContainerIdDescriptor.java
index 9514ee5..951de04 100644
--- a/src/main/java/org/libusb4java/ContainerIdDescriptor.java
+++ b/src/main/java/org/libusb4java/ContainerIdDescriptor.java
@@ -16,14 +16,14 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the Container ID descriptor.
diff --git a/src/main/java/org/libusb4java/Context.java b/src/main/java/org/libusb4java/Context.java
index 77c0815..d25886e 100644
--- a/src/main/java/org/libusb4java/Context.java
+++ b/src/main/java/org/libusb4java/Context.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Structure representing a libusb session. The concept of individual libusb
diff --git a/src/main/java/org/libusb4java/ControlSetup.java b/src/main/java/org/libusb4java/ControlSetup.java
index 09927d0..d7324b5 100644
--- a/src/main/java/org/libusb4java/ControlSetup.java
+++ b/src/main/java/org/libusb4java/ControlSetup.java
@@ -16,12 +16,12 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.usb4java.utils.BufferUtils;
+import org.libusb4java.utils.BufferUtils;
 
 /**
  * Setup packet for control transfers.
diff --git a/src/main/java/org/libusb4java/Device.java b/src/main/java/org/libusb4java/Device.java
index e94b0f0..397820c 100644
--- a/src/main/java/org/libusb4java/Device.java
+++ b/src/main/java/org/libusb4java/Device.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Structure representing a USB device detected on the system.
diff --git a/src/main/java/org/libusb4java/DeviceDescriptor.java b/src/main/java/org/libusb4java/DeviceDescriptor.java
index 91ce46e..888391c 100644
--- a/src/main/java/org/libusb4java/DeviceDescriptor.java
+++ b/src/main/java/org/libusb4java/DeviceDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
@@ -25,8 +25,8 @@ import javax.usb.UsbDeviceDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.BufferUtils;
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.BufferUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB device descriptor.
diff --git a/src/main/java/org/libusb4java/DeviceHandle.java b/src/main/java/org/libusb4java/DeviceHandle.java
index 4ac4dea..3715809 100644
--- a/src/main/java/org/libusb4java/DeviceHandle.java
+++ b/src/main/java/org/libusb4java/DeviceHandle.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Structure representing a handle on a USB device.
diff --git a/src/main/java/org/libusb4java/DeviceList.java b/src/main/java/org/libusb4java/DeviceList.java
index 76be30f..8408442 100644
--- a/src/main/java/org/libusb4java/DeviceList.java
+++ b/src/main/java/org/libusb4java/DeviceList.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/libusb4java/DeviceListIterator.java b/src/main/java/org/libusb4java/DeviceListIterator.java
index 3e16ad0..09aa427 100644
--- a/src/main/java/org/libusb4java/DeviceListIterator.java
+++ b/src/main/java/org/libusb4java/DeviceListIterator.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/libusb4java/EndpointDescriptor.java b/src/main/java/org/libusb4java/EndpointDescriptor.java
index 5a1ec1e..d7ab1b9 100644
--- a/src/main/java/org/libusb4java/EndpointDescriptor.java
+++ b/src/main/java/org/libusb4java/EndpointDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
@@ -25,7 +25,7 @@ import javax.usb.UsbEndpointDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB endpoint descriptor.
diff --git a/src/main/java/org/libusb4java/HotplugCallback.java b/src/main/java/org/libusb4java/HotplugCallback.java
index 85677e4..23ad164 100644
--- a/src/main/java/org/libusb4java/HotplugCallback.java
+++ b/src/main/java/org/libusb4java/HotplugCallback.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Hotplug callback..
diff --git a/src/main/java/org/libusb4java/HotplugCallbackHandle.java b/src/main/java/org/libusb4java/HotplugCallbackHandle.java
index fc6267a..4ffdbd0 100644
--- a/src/main/java/org/libusb4java/HotplugCallbackHandle.java
+++ b/src/main/java/org/libusb4java/HotplugCallbackHandle.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Hotplug Callback Handle.
diff --git a/src/main/java/org/libusb4java/Interface.java b/src/main/java/org/libusb4java/Interface.java
index 8254656..f6a7b1d 100644
--- a/src/main/java/org/libusb4java/Interface.java
+++ b/src/main/java/org/libusb4java/Interface.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/org/libusb4java/InterfaceDescriptor.java b/src/main/java/org/libusb4java/InterfaceDescriptor.java
index 7985189..d4f9c3f 100644
--- a/src/main/java/org/libusb4java/InterfaceDescriptor.java
+++ b/src/main/java/org/libusb4java/InterfaceDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
@@ -25,7 +25,7 @@ import javax.usb.UsbInterfaceDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB interface descriptor.
diff --git a/src/main/java/org/libusb4java/IsoPacketDescriptor.java b/src/main/java/org/libusb4java/IsoPacketDescriptor.java
index 8f1c03e..1eb46c1 100644
--- a/src/main/java/org/libusb4java/IsoPacketDescriptor.java
+++ b/src/main/java/org/libusb4java/IsoPacketDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Isochronous packet descriptor.
diff --git a/src/main/java/org/libusb4java/LibUsb.java b/src/main/java/org/libusb4java/LibUsb.java
index 57cb43b..bac7714 100644
--- a/src/main/java/org/libusb4java/LibUsb.java
+++ b/src/main/java/org/libusb4java/LibUsb.java
@@ -17,7 +17,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.io.FileDescriptor;
 import java.nio.ByteBuffer;
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
-import org.usb4java.utils.BufferUtils;
+import org.libusb4java.utils.BufferUtils;
 
 /**
  * Static class providing the constants and functions of libusb.
diff --git a/src/main/java/org/libusb4java/LibUsbException.java b/src/main/java/org/libusb4java/LibUsbException.java
index f920a92..ef771df 100644
--- a/src/main/java/org/libusb4java/LibUsbException.java
+++ b/src/main/java/org/libusb4java/LibUsbException.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import javax.usb.UsbException;
 
diff --git a/src/main/java/org/libusb4java/Loader.java b/src/main/java/org/libusb4java/Loader.java
index 8a0a82c..c0fca61 100644
--- a/src/main/java/org/libusb4java/Loader.java
+++ b/src/main/java/org/libusb4java/Loader.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/main/java/org/libusb4java/LoaderException.java b/src/main/java/org/libusb4java/LoaderException.java
index 697603b..4a05cc5 100644
--- a/src/main/java/org/libusb4java/LoaderException.java
+++ b/src/main/java/org/libusb4java/LoaderException.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Thrown when JNI library could not be loaded.
diff --git a/src/main/java/org/libusb4java/PollfdListener.java b/src/main/java/org/libusb4java/PollfdListener.java
index 924abf1..5b265e9 100644
--- a/src/main/java/org/libusb4java/PollfdListener.java
+++ b/src/main/java/org/libusb4java/PollfdListener.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.io.FileDescriptor;
 
diff --git a/src/main/java/org/libusb4java/SsEndpointCompanionDescriptor.java b/src/main/java/org/libusb4java/SsEndpointCompanionDescriptor.java
index ad9d125..b5d15de 100644
--- a/src/main/java/org/libusb4java/SsEndpointCompanionDescriptor.java
+++ b/src/main/java/org/libusb4java/SsEndpointCompanionDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/org/libusb4java/SsUsbDeviceCapabilityDescriptor.java b/src/main/java/org/libusb4java/SsUsbDeviceCapabilityDescriptor.java
index 0695e0d..4b05d0b 100644
--- a/src/main/java/org/libusb4java/SsUsbDeviceCapabilityDescriptor.java
+++ b/src/main/java/org/libusb4java/SsUsbDeviceCapabilityDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/org/libusb4java/Transfer.java b/src/main/java/org/libusb4java/Transfer.java
index 1794c8a..7976a5c 100644
--- a/src/main/java/org/libusb4java/Transfer.java
+++ b/src/main/java/org/libusb4java/Transfer.java
@@ -17,7 +17,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/org/libusb4java/TransferCallback.java b/src/main/java/org/libusb4java/TransferCallback.java
index 7f2268a..426030d 100644
--- a/src/main/java/org/libusb4java/TransferCallback.java
+++ b/src/main/java/org/libusb4java/TransferCallback.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 /**
  * Asynchronous transfer callback.
diff --git a/src/main/java/org/libusb4java/Usb20ExtensionDescriptor.java b/src/main/java/org/libusb4java/Usb20ExtensionDescriptor.java
index b0e80c8..ea8279c 100644
--- a/src/main/java/org/libusb4java/Usb20ExtensionDescriptor.java
+++ b/src/main/java/org/libusb4java/Usb20ExtensionDescriptor.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/org/libusb4java/Version.java b/src/main/java/org/libusb4java/Version.java
index e82abe3..435cad9 100644
--- a/src/main/java/org/libusb4java/Version.java
+++ b/src/main/java/org/libusb4java/Version.java
@@ -16,7 +16,7 @@
  * Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/src/main/java/org/libusb4java/package-info.java b/src/main/java/org/libusb4java/package-info.java
index 13110e1..792f0aa 100644
--- a/src/main/java/org/libusb4java/package-info.java
+++ b/src/main/java/org/libusb4java/package-info.java
@@ -6,5 +6,5 @@
 /**
  * Low-Level classes based on the native libusb library.
  */
-package org.usb4java.libusb;
+package org.libusb4java;
 
diff --git a/src/main/java/org/libusb4java/utils/BufferUtils.java b/src/main/java/org/libusb4java/utils/BufferUtils.java
index ba92e00..c7e6e97 100644
--- a/src/main/java/org/libusb4java/utils/BufferUtils.java
+++ b/src/main/java/org/libusb4java/utils/BufferUtils.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.utils;
+package org.libusb4java.utils;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
diff --git a/src/main/java/org/libusb4java/utils/DescriptorUtils.java b/src/main/java/org/libusb4java/utils/DescriptorUtils.java
index aa12878..fd9255b 100644
--- a/src/main/java/org/libusb4java/utils/DescriptorUtils.java
+++ b/src/main/java/org/libusb4java/utils/DescriptorUtils.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.utils;
+package org.libusb4java.utils;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -14,7 +14,7 @@ import javax.usb.UsbDeviceDescriptor;
 import javax.usb.UsbEndpointDescriptor;
 import javax.usb.UsbInterfaceDescriptor;
 
-import org.usb4java.libusb.LibUsb;
+import org.libusb4java.LibUsb;
 
 /**
  * Utility methods used for descriptor dumps.
diff --git a/src/main/java/org/libusb4java/utils/package-info.java b/src/main/java/org/libusb4java/utils/package-info.java
index 07427df..2c66c2b 100644
--- a/src/main/java/org/libusb4java/utils/package-info.java
+++ b/src/main/java/org/libusb4java/utils/package-info.java
@@ -6,4 +6,4 @@
 /**
  * Utility classes providing static helper methods.
  */
-package org.usb4java.utils;
+package org.libusb4java.utils;
diff --git a/src/main/java/org/usb4java/AbstractDevice.java b/src/main/java/org/usb4java/AbstractDevice.java
index 42246a3..f27a413 100644
--- a/src/main/java/org/usb4java/AbstractDevice.java
+++ b/src/main/java/org/usb4java/AbstractDevice.java
@@ -28,11 +28,11 @@ import javax.usb.event.UsbDeviceListener;
 import javax.usb.util.DefaultUsbControlIrp;
 
 import org.usb4java.descriptors.SimpleUsbStringDescriptor;
-import org.usb4java.libusb.ConfigDescriptor;
-import org.usb4java.libusb.Device;
-import org.usb4java.libusb.DeviceHandle;
-import org.usb4java.libusb.LibUsb;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.ConfigDescriptor;
+import org.libusb4java.Device;
+import org.libusb4java.DeviceHandle;
+import org.libusb4java.LibUsb;
+import org.libusb4java.LibUsbException;
 
 /**
  * A Usb device.
diff --git a/src/main/java/org/usb4java/AbstractIrpQueue.java b/src/main/java/org/usb4java/AbstractIrpQueue.java
index df9d56d..bc9f0c4 100644
--- a/src/main/java/org/usb4java/AbstractIrpQueue.java
+++ b/src/main/java/org/usb4java/AbstractIrpQueue.java
@@ -14,9 +14,9 @@ import javax.usb.UsbException;
 import javax.usb.UsbIrp;
 import javax.usb.UsbShortPacketException;
 
-import org.usb4java.libusb.DeviceHandle;
-import org.usb4java.libusb.LibUsb;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.DeviceHandle;
+import org.libusb4java.LibUsb;
+import org.libusb4java.LibUsbException;
 
 
 /**
diff --git a/src/main/java/org/usb4java/Configuration.java b/src/main/java/org/usb4java/Configuration.java
index 08f9461..6ed4f82 100644
--- a/src/main/java/org/usb4java/Configuration.java
+++ b/src/main/java/org/usb4java/Configuration.java
@@ -18,10 +18,10 @@ import javax.usb.UsbDisconnectedException;
 import javax.usb.UsbException;
 
 import org.usb4java.descriptors.SimpleUsbConfigurationDescriptor;
-import org.usb4java.libusb.ConfigDescriptor;
-import org.usb4java.libusb.InterfaceDescriptor;
-import org.usb4java.libusb.LibUsb;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.ConfigDescriptor;
+import org.libusb4java.InterfaceDescriptor;
+import org.libusb4java.LibUsb;
+import org.libusb4java.LibUsbException;
 
 /**
  * usb4java implementation of JSR-80 UsbConfiguration.
@@ -60,7 +60,7 @@ final class Configuration implements UsbConfiguration
     {
         this.device = device;
         this.descriptor = new SimpleUsbConfigurationDescriptor(descriptor);
-        for (org.usb4java.libusb.Interface iface: descriptor.iface())
+        for (org.libusb4java.Interface iface: descriptor.iface())
         {
             for (InterfaceDescriptor ifaceDescriptor: iface.altsetting())
             {
diff --git a/src/main/java/org/usb4java/DeviceManager.java b/src/main/java/org/usb4java/DeviceManager.java
index b26ef24..0c50252 100644
--- a/src/main/java/org/usb4java/DeviceManager.java
+++ b/src/main/java/org/usb4java/DeviceManager.java
@@ -15,12 +15,12 @@ import javax.usb.UsbException;
 import javax.usb.UsbHub;
 
 import org.usb4java.descriptors.SimpleUsbDeviceDescriptor;
-import org.usb4java.libusb.Context;
-import org.usb4java.libusb.Device;
-import org.usb4java.libusb.DeviceDescriptor;
-import org.usb4java.libusb.DeviceList;
-import org.usb4java.libusb.LibUsb;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.Context;
+import org.libusb4java.Device;
+import org.libusb4java.DeviceDescriptor;
+import org.libusb4java.DeviceList;
+import org.libusb4java.LibUsb;
+import org.libusb4java.LibUsbException;
 
 /**
  * Manages the USB devices.
diff --git a/src/main/java/org/usb4java/Endpoint.java b/src/main/java/org/usb4java/Endpoint.java
index 0f9095f..1118e01 100644
--- a/src/main/java/org/usb4java/Endpoint.java
+++ b/src/main/java/org/usb4java/Endpoint.java
@@ -11,7 +11,7 @@ import javax.usb.UsbEndpointDescriptor;
 import javax.usb.UsbPipe;
 
 import org.usb4java.descriptors.SimpleUsbEndpointDescriptor;
-import org.usb4java.libusb.EndpointDescriptor;
+import org.libusb4java.EndpointDescriptor;
 
 /**
  * usb4java implementation of UsbEndpoint.
diff --git a/src/main/java/org/usb4java/Hub.java b/src/main/java/org/usb4java/Hub.java
index 73eea15..3315543 100644
--- a/src/main/java/org/usb4java/Hub.java
+++ b/src/main/java/org/usb4java/Hub.java
@@ -9,8 +9,8 @@ import java.util.List;
 
 import javax.usb.UsbHub;
 
-import org.usb4java.libusb.Device;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.Device;
+import org.libusb4java.LibUsbException;
 
 /**
  * usb4java implementation of JSR-80 UsbHub.
diff --git a/src/main/java/org/usb4java/Interface.java b/src/main/java/org/usb4java/Interface.java
index 0e49036..8c0dbfc 100644
--- a/src/main/java/org/usb4java/Interface.java
+++ b/src/main/java/org/usb4java/Interface.java
@@ -20,8 +20,8 @@ import javax.usb.UsbInterfacePolicy;
 import javax.usb.UsbNotActiveException;
 
 import org.usb4java.descriptors.SimpleUsbInterfaceDescriptor;
-import org.usb4java.libusb.EndpointDescriptor;
-import org.usb4java.libusb.InterfaceDescriptor;
+import org.libusb4java.EndpointDescriptor;
+import org.libusb4java.InterfaceDescriptor;
 
 /**
  * usb4java implementation of UsbInterface.
diff --git a/src/main/java/org/usb4java/IrpQueue.java b/src/main/java/org/usb4java/IrpQueue.java
index 75fe3cd..497fd75 100644
--- a/src/main/java/org/usb4java/IrpQueue.java
+++ b/src/main/java/org/usb4java/IrpQueue.java
@@ -16,9 +16,9 @@ import javax.usb.UsbException;
 import javax.usb.UsbIrp;
 import javax.usb.UsbShortPacketException;
 
-import org.usb4java.libusb.DeviceHandle;
-import org.usb4java.libusb.LibUsb;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.DeviceHandle;
+import org.libusb4java.LibUsb;
+import org.libusb4java.LibUsbException;
 
 /**
  * A queue for USB I/O request packets.
diff --git a/src/main/java/org/usb4java/NonHub.java b/src/main/java/org/usb4java/NonHub.java
index f3e248d..1a5e149 100644
--- a/src/main/java/org/usb4java/NonHub.java
+++ b/src/main/java/org/usb4java/NonHub.java
@@ -5,8 +5,8 @@
 
 package org.usb4java;
 
-import org.usb4java.libusb.Device;
-import org.usb4java.libusb.LibUsbException;
+import org.libusb4java.Device;
+import org.libusb4java.LibUsbException;
 
 /**
  * A non-hub USB device.
diff --git a/src/main/java/org/usb4java/Services.java b/src/main/java/org/usb4java/Services.java
index 502f40b..3d6cf0f 100644
--- a/src/main/java/org/usb4java/Services.java
+++ b/src/main/java/org/usb4java/Services.java
@@ -13,8 +13,8 @@ import javax.usb.UsbServices;
 import javax.usb.event.UsbServicesEvent;
 import javax.usb.event.UsbServicesListener;
 
-import org.usb4java.libusb.Loader;
-import org.usb4java.libusb.LoaderException;
+import org.libusb4java.Loader;
+import org.libusb4java.LoaderException;
 
 /**
  * usb4java implementation of JSR-80 UsbServices.
diff --git a/src/main/java/org/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java b/src/main/java/org/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java
index 8b309ee..ff71d0c 100644
--- a/src/main/java/org/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java
+++ b/src/main/java/org/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java
@@ -10,7 +10,7 @@ import javax.usb.UsbConfigurationDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * Simple USB configuration descriptor.
diff --git a/src/main/java/org/usb4java/descriptors/SimpleUsbDeviceDescriptor.java b/src/main/java/org/usb4java/descriptors/SimpleUsbDeviceDescriptor.java
index 94b3136..97ca858 100644
--- a/src/main/java/org/usb4java/descriptors/SimpleUsbDeviceDescriptor.java
+++ b/src/main/java/org/usb4java/descriptors/SimpleUsbDeviceDescriptor.java
@@ -10,7 +10,7 @@ import javax.usb.UsbDeviceDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * Simple USB device descriptor.
diff --git a/src/main/java/org/usb4java/descriptors/SimpleUsbEndpointDescriptor.java b/src/main/java/org/usb4java/descriptors/SimpleUsbEndpointDescriptor.java
index 006ec38..fee1037 100644
--- a/src/main/java/org/usb4java/descriptors/SimpleUsbEndpointDescriptor.java
+++ b/src/main/java/org/usb4java/descriptors/SimpleUsbEndpointDescriptor.java
@@ -10,7 +10,7 @@ import javax.usb.UsbEndpointDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * Simple USB endpoint descriptor.
diff --git a/src/main/java/org/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java b/src/main/java/org/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java
index d9e91b8..80d81c0 100644
--- a/src/main/java/org/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java
+++ b/src/main/java/org/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java
@@ -10,7 +10,7 @@ import javax.usb.UsbInterfaceDescriptor;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.usb4java.utils.DescriptorUtils;
+import org.libusb4java.utils.DescriptorUtils;
 
 /**
  * Simple USB interface descriptor.