diff --git a/src/main/java/org/usb4java/libusb/BosDescriptor.java b/src/main/java/org/libusb4java/BosDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/BosDescriptor.java
rename to src/main/java/org/libusb4java/BosDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/BosDevCapabilityDescriptor.java b/src/main/java/org/libusb4java/BosDevCapabilityDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/BosDevCapabilityDescriptor.java
rename to src/main/java/org/libusb4java/BosDevCapabilityDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/ConfigDescriptor.java b/src/main/java/org/libusb4java/ConfigDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/ConfigDescriptor.java
rename to src/main/java/org/libusb4java/ConfigDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/ContainerIdDescriptor.java b/src/main/java/org/libusb4java/ContainerIdDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/ContainerIdDescriptor.java
rename to src/main/java/org/libusb4java/ContainerIdDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/Context.java b/src/main/java/org/libusb4java/Context.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Context.java
rename to src/main/java/org/libusb4java/Context.java
diff --git a/src/main/java/org/usb4java/libusb/ControlSetup.java b/src/main/java/org/libusb4java/ControlSetup.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/ControlSetup.java
rename to src/main/java/org/libusb4java/ControlSetup.java
diff --git a/src/main/java/org/usb4java/libusb/Device.java b/src/main/java/org/libusb4java/Device.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Device.java
rename to src/main/java/org/libusb4java/Device.java
diff --git a/src/main/java/org/usb4java/libusb/DeviceDescriptor.java b/src/main/java/org/libusb4java/DeviceDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/DeviceDescriptor.java
rename to src/main/java/org/libusb4java/DeviceDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/DeviceHandle.java b/src/main/java/org/libusb4java/DeviceHandle.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/DeviceHandle.java
rename to src/main/java/org/libusb4java/DeviceHandle.java
diff --git a/src/main/java/org/usb4java/libusb/DeviceList.java b/src/main/java/org/libusb4java/DeviceList.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/DeviceList.java
rename to src/main/java/org/libusb4java/DeviceList.java
diff --git a/src/main/java/org/usb4java/libusb/DeviceListIterator.java b/src/main/java/org/libusb4java/DeviceListIterator.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/DeviceListIterator.java
rename to src/main/java/org/libusb4java/DeviceListIterator.java
diff --git a/src/main/java/org/usb4java/libusb/EndpointDescriptor.java b/src/main/java/org/libusb4java/EndpointDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/EndpointDescriptor.java
rename to src/main/java/org/libusb4java/EndpointDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/HotplugCallback.java b/src/main/java/org/libusb4java/HotplugCallback.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/HotplugCallback.java
rename to src/main/java/org/libusb4java/HotplugCallback.java
diff --git a/src/main/java/org/usb4java/libusb/HotplugCallbackHandle.java b/src/main/java/org/libusb4java/HotplugCallbackHandle.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/HotplugCallbackHandle.java
rename to src/main/java/org/libusb4java/HotplugCallbackHandle.java
diff --git a/src/main/java/org/usb4java/libusb/Interface.java b/src/main/java/org/libusb4java/Interface.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Interface.java
rename to src/main/java/org/libusb4java/Interface.java
diff --git a/src/main/java/org/usb4java/libusb/InterfaceDescriptor.java b/src/main/java/org/libusb4java/InterfaceDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/InterfaceDescriptor.java
rename to src/main/java/org/libusb4java/InterfaceDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/IsoPacketDescriptor.java b/src/main/java/org/libusb4java/IsoPacketDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/IsoPacketDescriptor.java
rename to src/main/java/org/libusb4java/IsoPacketDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/LibUsb.java b/src/main/java/org/libusb4java/LibUsb.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/LibUsb.java
rename to src/main/java/org/libusb4java/LibUsb.java
diff --git a/src/main/java/org/usb4java/libusb/LibUsbException.java b/src/main/java/org/libusb4java/LibUsbException.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/LibUsbException.java
rename to src/main/java/org/libusb4java/LibUsbException.java
diff --git a/src/main/java/org/usb4java/libusb/Loader.java b/src/main/java/org/libusb4java/Loader.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Loader.java
rename to src/main/java/org/libusb4java/Loader.java
diff --git a/src/main/java/org/usb4java/libusb/LoaderException.java b/src/main/java/org/libusb4java/LoaderException.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/LoaderException.java
rename to src/main/java/org/libusb4java/LoaderException.java
diff --git a/src/main/java/org/usb4java/libusb/PollfdListener.java b/src/main/java/org/libusb4java/PollfdListener.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/PollfdListener.java
rename to src/main/java/org/libusb4java/PollfdListener.java
diff --git a/src/main/java/org/usb4java/libusb/SsEndpointCompanionDescriptor.java b/src/main/java/org/libusb4java/SsEndpointCompanionDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/SsEndpointCompanionDescriptor.java
rename to src/main/java/org/libusb4java/SsEndpointCompanionDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptor.java b/src/main/java/org/libusb4java/SsUsbDeviceCapabilityDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptor.java
rename to src/main/java/org/libusb4java/SsUsbDeviceCapabilityDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/Transfer.java b/src/main/java/org/libusb4java/Transfer.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Transfer.java
rename to src/main/java/org/libusb4java/Transfer.java
diff --git a/src/main/java/org/usb4java/libusb/TransferCallback.java b/src/main/java/org/libusb4java/TransferCallback.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/TransferCallback.java
rename to src/main/java/org/libusb4java/TransferCallback.java
diff --git a/src/main/java/org/usb4java/libusb/Usb20ExtensionDescriptor.java b/src/main/java/org/libusb4java/Usb20ExtensionDescriptor.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Usb20ExtensionDescriptor.java
rename to src/main/java/org/libusb4java/Usb20ExtensionDescriptor.java
diff --git a/src/main/java/org/usb4java/libusb/Version.java b/src/main/java/org/libusb4java/Version.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/Version.java
rename to src/main/java/org/libusb4java/Version.java
diff --git a/src/main/java/org/usb4java/libusb/package-info.java b/src/main/java/org/libusb4java/package-info.java
similarity index 100%
rename from src/main/java/org/usb4java/libusb/package-info.java
rename to src/main/java/org/libusb4java/package-info.java